summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/pxamci.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-21 20:05:45 +0100
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-21 20:05:45 +0100
commitd04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch)
treeb6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/mmc/pxamci.c
parent[SCSI] eliminate rphy allocation in favour of expander/end device allocation (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
downloadlinux-d04cdb64212eb5ae6a98026a97dda626e40e8e9a.tar.xz
linux-d04cdb64212eb5ae6a98026a97dda626e40e8e9a.zip
Merge ../linux-2.6
Diffstat (limited to 'drivers/mmc/pxamci.c')
-rw-r--r--drivers/mmc/pxamci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 285d7d068097..c32fad1ce51c 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -438,7 +438,7 @@ static int pxamci_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!r || irq == NO_IRQ)
+ if (!r || irq < 0)
return -ENXIO;
r = request_mem_region(r->start, SZ_4K, DRIVER_NAME);