diff options
| author | Linus Torvalds | 2011-11-12 02:55:01 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-12 02:55:01 +0100 |
| commit | 87618e0003dbca0f51f1ef52fa4199bd65212f41 (patch) | |
| tree | d814cfe3675352bea6133518b7d93d7052048ece /drivers/ata/pata_of_platform.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | pata_of_platform: Don't use NO_IRQ (diff) | |
| download | kernel-qcow2-linux-87618e0003dbca0f51f1ef52fa4199bd65212f41.tar.gz kernel-qcow2-linux-87618e0003dbca0f51f1ef52fa4199bd65212f41.tar.xz kernel-qcow2-linux-87618e0003dbca0f51f1ef52fa4199bd65212f41.zip | |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
pata_of_platform: Don't use NO_IRQ
[libata] ahci: Add ASMedia ASM1061 support
[libata] Issue SRST to Sil3726 PMP
sata_sis.c: trivial spelling fix
ahci_platform: use dev_get_platdata()
[libata] libata-scsi.c: Add function parameter documentation
Diffstat (limited to 'drivers/ata/pata_of_platform.c')
| -rw-r--r-- | drivers/ata/pata_of_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c index a72ab0dde4e5..2a472c5bb7db 100644 --- a/drivers/ata/pata_of_platform.c +++ b/drivers/ata/pata_of_platform.c @@ -52,7 +52,7 @@ static int __devinit pata_of_platform_probe(struct platform_device *ofdev) } ret = of_irq_to_resource(dn, 0, &irq_res); - if (ret == NO_IRQ) + if (!ret) irq_res.start = irq_res.end = 0; else irq_res.flags = 0; |