drm/nouveau/kms: Don't change EDID when it hasn't actually changed

[linux.git] / drivers / scsi / pmcraid.c

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 7eb88fe1eb0bc988589470251785f4a2d7023617..aa9ae2ae8579710d2e819f23241653093fa087ee 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4652,7 +4652,7 @@ static int pmcraid_allocate_control_blocks(struct pmcraid_instance *pinstance)
 
        for (i = 0; i < PMCRAID_MAX_CMD; i++) {
                pinstance->cmd_list[i]->ioa_cb =
-                       dma_pool_alloc(
+                       dma_pool_zalloc(
                                pinstance->control_pool,
                                GFP_KERNEL,
                                &(pinstance->cmd_list[i]->ioa_cb_bus_addr));
@@ -4661,8 +4661,6 @@ static int pmcraid_allocate_control_blocks(struct pmcraid_instance *pinstance)
                        pmcraid_release_control_blocks(pinstance, i);
                        return -ENOMEM;
                }
-               memset(pinstance->cmd_list[i]->ioa_cb, 0,
-                       sizeof(struct pmcraid_control_block));
        }
        return 0;
 }