projects
/
linux-block.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/davem/ide-2.6
[linux-block.git]
/
drivers
/
scsi
/
sun3x_esp.c
diff --git
a/drivers/scsi/sun3x_esp.c
b/drivers/scsi/sun3x_esp.c
index 06152c7fa689bfd21e6dbd7df465ea060a0dcd85..34a99620e5bd35ca2d7ed411ed42004d59788240 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);
@@
-294,6
+294,7
@@
static struct platform_driver esp_sun3x_driver = {
.remove = __devexit_p(esp_sun3x_remove),
.driver = {
.name = "sun3x_esp",
.remove = __devexit_p(esp_sun3x_remove),
.driver = {
.name = "sun3x_esp",
+ .owner = THIS_MODULE,
},
};
},
};
@@
-314,3
+315,4
@@
MODULE_VERSION(DRV_VERSION);
module_init(sun3x_esp_init);
module_exit(sun3x_esp_exit);
module_init(sun3x_esp_init);
module_exit(sun3x_esp_exit);
+MODULE_ALIAS("platform:sun3x_esp");