diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
| commit | e42321ef0002b517c9fefdf43cc39e24462b16cf (patch) | |
| tree | 70e013f5f7f45da559afa8167039e37e5eab96ff /drivers/media/pci/ngene/ngene-core.c | |
| parent | 1e2d23cc747df325a0ff199dd4ac250e1d8cc7a0 (diff) | |
| parent | aa661602d17c90be3fc9c2f22359c17c98db4c11 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/media/pci/ngene/ngene-core.c')
| -rw-r--r-- | drivers/media/pci/ngene/ngene-core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index 826228c3800e..4930b55fd5f4 100644 --- a/drivers/media/pci/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c @@ -1075,12 +1075,11 @@ static int AllocCommonBuffers(struct ngene *dev) dev->ngenetohost = dev->FWInterfaceBuffer + 256; dev->EventBuffer = dev->FWInterfaceBuffer + 512; - dev->OverflowBuffer = pci_alloc_consistent(dev->pci_dev, - OVERFLOW_BUFFER_SIZE, - &dev->PAOverflowBuffer); + dev->OverflowBuffer = pci_zalloc_consistent(dev->pci_dev, + OVERFLOW_BUFFER_SIZE, + &dev->PAOverflowBuffer); if (!dev->OverflowBuffer) return -ENOMEM; - memset(dev->OverflowBuffer, 0, OVERFLOW_BUFFER_SIZE); for (i = STREAM_VIDEOIN1; i < MAX_STREAM; i++) { int type = dev->card_info->io_type[i]; |