aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bvme6000_scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/bvme6000_scsi.c')
-rw-r--r--drivers/scsi/bvme6000_scsi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/bvme6000_scsi.c b/drivers/scsi/bvme6000_scsi.c
index cac354086737..d858f3d41274 100644
--- a/drivers/scsi/bvme6000_scsi.c
+++ b/drivers/scsi/bvme6000_scsi.c
@@ -36,19 +36,18 @@ static struct platform_device *bvme6000_scsi_device;
36static __devinit int 36static __devinit int
37bvme6000_probe(struct device *dev) 37bvme6000_probe(struct device *dev)
38{ 38{
39 struct Scsi_Host * host = NULL; 39 struct Scsi_Host *host;
40 struct NCR_700_Host_Parameters *hostdata; 40 struct NCR_700_Host_Parameters *hostdata;
41 41
42 if (!MACH_IS_BVME6000) 42 if (!MACH_IS_BVME6000)
43 goto out; 43 goto out;
44 44
45 hostdata = kmalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL); 45 hostdata = kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
46 if (hostdata == NULL) { 46 if (!hostdata) {
47 printk(KERN_ERR "bvme6000-scsi: " 47 printk(KERN_ERR "bvme6000-scsi: "
48 "Failed to allocate host data\n"); 48 "Failed to allocate host data\n");
49 goto out; 49 goto out;
50 } 50 }
51 memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
52 51
53 /* Fill in the required pieces of hostdata */ 52 /* Fill in the required pieces of hostdata */
54 hostdata->base = (void __iomem *)BVME_NCR53C710_BASE; 53 hostdata->base = (void __iomem *)BVME_NCR53C710_BASE;