diff options
author | Joe Perches <joe@perches.com> | 2014-08-08 17:24:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 18:57:28 -0400 |
commit | 6850aeabdd1fde7cd35f26d4e8779bec943e1cd9 (patch) | |
tree | 8bf82328936e4762df92a48129bc0bc65c580d60 /drivers/media/usb/ttusb-budget | |
parent | 59e2623b433552d7402dfacd2bc2d7a22a360a4f (diff) |
media: use pci_zalloc_consistent
Remove the now unnecessary memset too.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media/usb/ttusb-budget')
-rw-r--r-- | drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c index f166ffc9800a..cef7a00099ea 100644 --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | |||
@@ -803,11 +803,9 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb) | |||
803 | { | 803 | { |
804 | int i; | 804 | int i; |
805 | 805 | ||
806 | ttusb->iso_buffer = pci_alloc_consistent(NULL, | 806 | ttusb->iso_buffer = pci_zalloc_consistent(NULL, |
807 | ISO_FRAME_SIZE * | 807 | ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT, |
808 | FRAMES_PER_ISO_BUF * | 808 | &ttusb->iso_dma_handle); |
809 | ISO_BUF_COUNT, | ||
810 | &ttusb->iso_dma_handle); | ||
811 | 809 | ||
812 | if (!ttusb->iso_buffer) { | 810 | if (!ttusb->iso_buffer) { |
813 | dprintk("%s: pci_alloc_consistent - not enough memory\n", | 811 | dprintk("%s: pci_alloc_consistent - not enough memory\n", |
@@ -815,9 +813,6 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb) | |||
815 | return -ENOMEM; | 813 | return -ENOMEM; |
816 | } | 814 | } |
817 | 815 | ||
818 | memset(ttusb->iso_buffer, 0, | ||
819 | ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT); | ||
820 | |||
821 | for (i = 0; i < ISO_BUF_COUNT; i++) { | 816 | for (i = 0; i < ISO_BUF_COUNT; i++) { |
822 | struct urb *urb; | 817 | struct urb *urb; |
823 | 818 | ||