Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / ata / sata_nv.c

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 54bfab15c74a997b0bd55f5739fe7b49e4e929c2..b44b4b64354c242e990d5bf010b37579dc2456f8 100644 (file)
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1136,7 +1136,6 @@ static int nv_adma_port_start(struct ata_port *ap)
                                  &mem_dma, GFP_KERNEL);
        if (!mem)
                return -ENOMEM;
-       memset(mem, 0, NV_ADMA_PORT_PRIV_DMA_SZ);
 
        /*
         * First item in chunk of DMA memory:
@@ -1946,7 +1945,6 @@ static int nv_swncq_port_start(struct ata_port *ap)
                                      &pp->prd_dma, GFP_KERNEL);
        if (!pp->prd)
                return -ENOMEM;
-       memset(pp->prd, 0, ATA_PRD_TBL_SZ * ATA_MAX_QUEUE);
 
        ap->private_data = pp;
        pp->sactive_block = ap->ioaddr.scr_addr + 4 * SCR_ACTIVE;