projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[cascardo/linux.git]
/
drivers
/
scsi
/
mvme16x_scsi.c
diff --git
a/drivers/scsi/mvme16x_scsi.c
b/drivers/scsi/mvme16x_scsi.c
index
d6ef22a
..
b264b49
100644
(file)
--- a/
drivers/scsi/mvme16x_scsi.c
+++ b/
drivers/scsi/mvme16x_scsi.c
@@
-48,13
+48,12
@@
mvme16x_probe(struct device *dev)
goto out;
}
goto out;
}
- hostdata = k
m
alloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
+ hostdata = k
z
alloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
if (hostdata == NULL) {
printk(KERN_ERR "mvme16x-scsi: "
"Failed to allocate host data\n");
goto out;
}
if (hostdata == NULL) {
printk(KERN_ERR "mvme16x-scsi: "
"Failed to allocate host data\n");
goto out;
}
- memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
/* Fill in the required pieces of hostdata */
hostdata->base = (void __iomem *)0xfff47000UL;
/* Fill in the required pieces of hostdata */
hostdata->base = (void __iomem *)0xfff47000UL;
@@
-89,6
+88,7
@@
mvme16x_probe(struct device *dev)
out_be32(0xfff4202c, v);
}
out_be32(0xfff4202c, v);
}
+ dev_set_drvdata(dev, host);
scsi_scan_host(host);
return 0;
scsi_scan_host(host);
return 0;
@@
-104,7
+104,7
@@
mvme16x_probe(struct device *dev)
static __devexit int
mvme16x_device_remove(struct device *dev)
{
static __devexit int
mvme16x_device_remove(struct device *dev)
{
- struct Scsi_Host *host = dev_
to_shost
(dev);
+ struct Scsi_Host *host = dev_
get_drvdata
(dev);
struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
/* Disable scsi chip ints */
struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
/* Disable scsi chip ints */