diff options
Diffstat (limited to 'drivers/scsi/aic7xxx_old.c')
-rw-r--r-- | drivers/scsi/aic7xxx_old.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c index 4998bb850c49..1a71b0236c97 100644 --- a/drivers/scsi/aic7xxx_old.c +++ b/drivers/scsi/aic7xxx_old.c | |||
@@ -8416,10 +8416,9 @@ aic7xxx_alloc(struct scsi_host_template *sht, struct aic7xxx_host *temp) | |||
8416 | *p = *temp; | 8416 | *p = *temp; |
8417 | p->host = host; | 8417 | p->host = host; |
8418 | 8418 | ||
8419 | p->scb_data = kmalloc(sizeof(scb_data_type), GFP_ATOMIC); | 8419 | p->scb_data = kzalloc(sizeof(scb_data_type), GFP_ATOMIC); |
8420 | if (p->scb_data != NULL) | 8420 | if (!p->scb_data) |
8421 | { | 8421 | { |
8422 | memset(p->scb_data, 0, sizeof(scb_data_type)); | ||
8423 | scbq_init (&p->scb_data->free_scbs); | 8422 | scbq_init (&p->scb_data->free_scbs); |
8424 | } | 8423 | } |
8425 | else | 8424 | else |
@@ -9196,10 +9195,9 @@ aic7xxx_detect(struct scsi_host_template *template) | |||
9196 | printk(KERN_INFO " this driver, we are ignoring it.\n"); | 9195 | printk(KERN_INFO " this driver, we are ignoring it.\n"); |
9197 | } | 9196 | } |
9198 | } | 9197 | } |
9199 | else if ( (temp_p = kmalloc(sizeof(struct aic7xxx_host), | 9198 | else if ( (temp_p = kzalloc(sizeof(struct aic7xxx_host), |
9200 | GFP_ATOMIC)) != NULL ) | 9199 | GFP_ATOMIC)) != NULL ) |
9201 | { | 9200 | { |
9202 | memset(temp_p, 0, sizeof(struct aic7xxx_host)); | ||
9203 | temp_p->chip = aic_pdevs[i].chip | AHC_PCI; | 9201 | temp_p->chip = aic_pdevs[i].chip | AHC_PCI; |
9204 | temp_p->flags = aic_pdevs[i].flags; | 9202 | temp_p->flags = aic_pdevs[i].flags; |
9205 | temp_p->features = aic_pdevs[i].features; | 9203 | temp_p->features = aic_pdevs[i].features; |