Merge tag 'arm-soc/for-3.20/dts' of http://github.com/broadcom/stblinux into fixes

[karo-tx-linux.git] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4595c22f33f71e5b8305bb649b0df461658bb98f..ff20f192b0f67a77fc9e38092c457429e215f8a7 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1014,24 +1014,21 @@ static CommandList_struct *cmd_special_alloc(ctlr_info_t *h)
        u64bit temp64;
        dma_addr_t cmd_dma_handle, err_dma_handle;
 
-       c = (CommandList_struct *) pci_alloc_consistent(h->pdev,
-               sizeof(CommandList_struct), &cmd_dma_handle);
+       c = pci_zalloc_consistent(h->pdev, sizeof(CommandList_struct),
+                                 &cmd_dma_handle);
        if (c == NULL)
                return NULL;
-       memset(c, 0, sizeof(CommandList_struct));
 
        c->cmdindex = -1;
 
-       c->err_info = (ErrorInfo_struct *)
-           pci_alloc_consistent(h->pdev, sizeof(ErrorInfo_struct),
-                   &err_dma_handle);
+       c->err_info = pci_zalloc_consistent(h->pdev, sizeof(ErrorInfo_struct),
+                                           &err_dma_handle);
 
        if (c->err_info == NULL) {
                pci_free_consistent(h->pdev,
                        sizeof(CommandList_struct), c, cmd_dma_handle);
                return NULL;
        }
-       memset(c->err_info, 0, sizeof(ErrorInfo_struct));
 
        INIT_LIST_HEAD(&c->list);
        c->busaddr = (__u32) cmd_dma_handle;