diff options
Diffstat (limited to 'drivers/media/usb')
-rw-r--r-- | drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 11 | ||||
-rw-r--r-- | drivers/media/usb/ttusb-dec/ttusb_dec.c | 11 |
2 files changed, 6 insertions, 16 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 | ||
diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c index 29724af9b9ab..15ab584cf265 100644 --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c | |||
@@ -1151,11 +1151,9 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec) | |||
1151 | 1151 | ||
1152 | dprintk("%s\n", __func__); | 1152 | dprintk("%s\n", __func__); |
1153 | 1153 | ||
1154 | dec->iso_buffer = pci_alloc_consistent(NULL, | 1154 | dec->iso_buffer = pci_zalloc_consistent(NULL, |
1155 | ISO_FRAME_SIZE * | 1155 | ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT), |
1156 | (FRAMES_PER_ISO_BUF * | 1156 | &dec->iso_dma_handle); |
1157 | ISO_BUF_COUNT), | ||
1158 | &dec->iso_dma_handle); | ||
1159 | 1157 | ||
1160 | if (!dec->iso_buffer) { | 1158 | if (!dec->iso_buffer) { |
1161 | dprintk("%s: pci_alloc_consistent - not enough memory\n", | 1159 | dprintk("%s: pci_alloc_consistent - not enough memory\n", |
@@ -1163,9 +1161,6 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec) | |||
1163 | return -ENOMEM; | 1161 | return -ENOMEM; |
1164 | } | 1162 | } |
1165 | 1163 | ||
1166 | memset(dec->iso_buffer, 0, | ||
1167 | ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT)); | ||
1168 | |||
1169 | for (i = 0; i < ISO_BUF_COUNT; i++) { | 1164 | for (i = 0; i < ISO_BUF_COUNT; i++) { |
1170 | struct urb *urb; | 1165 | struct urb *urb; |
1171 | 1166 | ||