diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_hwi.c | 3 | ||||
-rw-r--r-- | drivers/scsi/scsi_lib.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c index da94e126ca83..0cd7eed9196c 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.c +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c | |||
@@ -1052,10 +1052,9 @@ static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha, | |||
1052 | struct asd_ascb *ascb; | 1052 | struct asd_ascb *ascb; |
1053 | unsigned long flags; | 1053 | unsigned long flags; |
1054 | 1054 | ||
1055 | ascb = kmem_cache_alloc(asd_ascb_cache, gfp_flags); | 1055 | ascb = kmem_cache_zalloc(asd_ascb_cache, gfp_flags); |
1056 | 1056 | ||
1057 | if (ascb) { | 1057 | if (ascb) { |
1058 | memset(ascb, 0, sizeof(*ascb)); | ||
1059 | ascb->dma_scb.size = sizeof(struct scb); | 1058 | ascb->dma_scb.size = sizeof(struct scb); |
1060 | ascb->dma_scb.vaddr = dma_pool_alloc(asd_ha->scb_pool, | 1059 | ascb->dma_scb.vaddr = dma_pool_alloc(asd_ha->scb_pool, |
1061 | gfp_flags, | 1060 | gfp_flags, |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f02f48a882a9..a1cd6e6a292a 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -388,10 +388,9 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd, | |||
388 | int err = 0; | 388 | int err = 0; |
389 | int write = (data_direction == DMA_TO_DEVICE); | 389 | int write = (data_direction == DMA_TO_DEVICE); |
390 | 390 | ||
391 | sioc = kmem_cache_alloc(scsi_io_context_cache, gfp); | 391 | sioc = kmem_cache_zalloc(scsi_io_context_cache, gfp); |
392 | if (!sioc) | 392 | if (!sioc) |
393 | return DRIVER_ERROR << 24; | 393 | return DRIVER_ERROR << 24; |
394 | memset(sioc, 0, sizeof(*sioc)); | ||
395 | 394 | ||
396 | req = blk_get_request(sdev->request_queue, write, gfp); | 395 | req = blk_get_request(sdev->request_queue, write, gfp); |
397 | if (!req) | 396 | if (!req) |