diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
| commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
| tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /drivers/mmc | |
| parent | 54da9a3968448681d0ddf193ec90f2480c5cba1c (diff) | |
| parent | 2cc432eed0491df66e14b578139bba2c75fb3f9a (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/pxamci.c | 2 |
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) | |||
| 438 | 438 | ||
| 439 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 439 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 440 | irq = platform_get_irq(pdev, 0); | 440 | irq = platform_get_irq(pdev, 0); |
| 441 | if (!r || irq == NO_IRQ) | 441 | if (!r || irq < 0) |
| 442 | return -ENXIO; | 442 | return -ENXIO; |
| 443 | 443 | ||
| 444 | r = request_mem_region(r->start, SZ_4K, DRIVER_NAME); | 444 | r = request_mem_region(r->start, SZ_4K, DRIVER_NAME); |