projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[cascardo/linux.git]
/
drivers
/
scsi
/
sun3x_esp.c
diff --git
a/drivers/scsi/sun3x_esp.c
b/drivers/scsi/sun3x_esp.c
index
7514b3a
..
34a9962
100644
(file)
--- a/
drivers/scsi/sun3x_esp.c
+++ b/
drivers/scsi/sun3x_esp.c
@@
-213,7
+213,7
@@
static int __devinit esp_sun3x_probe(struct platform_device *dev)
esp->ops = &sun3x_esp_ops;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
esp->ops = &sun3x_esp_ops;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
- if (!res
&&
!res->start)
+ if (!res
||
!res->start)
goto fail_unlink;
esp->regs = ioremap_nocache(res->start, 0x20);
goto fail_unlink;
esp->regs = ioremap_nocache(res->start, 0x20);
@@
-221,7
+221,7
@@
static int __devinit esp_sun3x_probe(struct platform_device *dev)
goto fail_unmap_regs;
res = platform_get_resource(dev, IORESOURCE_MEM, 1);
goto fail_unmap_regs;
res = platform_get_resource(dev, IORESOURCE_MEM, 1);
- if (!res
&&
!res->start)
+ if (!res
||
!res->start)
goto fail_unmap_regs;
esp->dma_regs = ioremap_nocache(res->start, 0x10);
goto fail_unmap_regs;
esp->dma_regs = ioremap_nocache(res->start, 0x10);