diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-18 17:56:59 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-18 17:56:59 +1000 |
commit | fb72985a0e9af81c2dd0714ec3ffc052a8886b8a (patch) | |
tree | 672f6c1ee62e25d9b291baa5994b3c91b6f5a9f7 /drivers/scsi/eata.c | |
parent | 706bf313be879cb232ccb0f7888f4cea85c798bf (diff) | |
parent | 675c7e4802e35f474c26b14a3417af93acd0470c (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/scsi/eata.c')
-rw-r--r-- | drivers/scsi/eata.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 03372cff38f3..813dd5c998e4 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c @@ -1238,8 +1238,8 @@ static int port_detect(unsigned long port_base, unsigned int j, struct eata_config *cf; dma_addr_t cf_dma_addr; - cf = pci_alloc_consistent(pdev, sizeof(struct eata_config), - &cf_dma_addr); + cf = pci_zalloc_consistent(pdev, sizeof(struct eata_config), + &cf_dma_addr); if (!cf) { printk @@ -1249,7 +1249,6 @@ static int port_detect(unsigned long port_base, unsigned int j, } /* Set board configuration */ - memset((char *)cf, 0, sizeof(struct eata_config)); cf->len = (ushort) H2DEV16((ushort) 510); cf->ocena = 1; |