diff options
author | Steven Toth <stoth@hauppauge.com> | 2008-04-17 20:41:28 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:43 -0400 |
commit | a9c36aad59a06df199cdbb365d0b05663f8008f1 (patch) | |
tree | 505cceb8d6842bf3ff7624de1d619deea98fc8cc /drivers/media/video/au0828/au0828-dvb.c | |
parent | 0daa5de740c65de7c9554071eec84c6731370065 (diff) |
V4L/DVB (7634): au0828: Cleanup
au0828: Cleanup
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/au0828/au0828-dvb.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-dvb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c index 8853f4e26092..4a27e5b41f53 100644 --- a/drivers/media/video/au0828/au0828-dvb.c +++ b/drivers/media/video/au0828/au0828-dvb.c | |||
@@ -31,6 +31,9 @@ | |||
31 | 31 | ||
32 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | 32 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
33 | 33 | ||
34 | #define _AU0828_BULKPIPE 0x83 | ||
35 | #define _BULKPIPESIZE 0xe522 | ||
36 | |||
34 | static struct au8522_config hauppauge_hvr950q_config = { | 37 | static struct au8522_config hauppauge_hvr950q_config = { |
35 | .demod_address = 0x8e >> 1, | 38 | .demod_address = 0x8e >> 1, |
36 | .status_mode = AU8522_DEMODLOCKING, | 39 | .status_mode = AU8522_DEMODLOCKING, |
@@ -66,7 +69,8 @@ static void urb_completion(struct urb *purb) | |||
66 | ptr = (u8 *)purb->transfer_buffer; | 69 | ptr = (u8 *)purb->transfer_buffer; |
67 | 70 | ||
68 | /* Feed the transport payload into the kernel demux */ | 71 | /* Feed the transport payload into the kernel demux */ |
69 | dvb_dmx_swfilter_packets(&dev->dvb.demux, purb->transfer_buffer, purb->actual_length / 188); | 72 | dvb_dmx_swfilter_packets(&dev->dvb.demux, |
73 | purb->transfer_buffer, purb->actual_length / 188); | ||
70 | 74 | ||
71 | /* Clean the buffer before we requeue */ | 75 | /* Clean the buffer before we requeue */ |
72 | memset(purb->transfer_buffer, 0, URB_BUFSIZE); | 76 | memset(purb->transfer_buffer, 0, URB_BUFSIZE); |
@@ -81,7 +85,6 @@ static int stop_urb_transfer(struct au0828_dev *dev) | |||
81 | 85 | ||
82 | dprintk(2, "%s()\n", __func__); | 86 | dprintk(2, "%s()\n", __func__); |
83 | 87 | ||
84 | /* FIXME: Do we need to free the transfer_buffers? */ | ||
85 | for (i = 0; i < URB_COUNT; i++) { | 88 | for (i = 0; i < URB_COUNT; i++) { |
86 | usb_kill_urb(dev->urbs[i]); | 89 | usb_kill_urb(dev->urbs[i]); |
87 | kfree(dev->urbs[i]->transfer_buffer); | 90 | kfree(dev->urbs[i]->transfer_buffer); |
@@ -93,9 +96,6 @@ static int stop_urb_transfer(struct au0828_dev *dev) | |||
93 | return 0; | 96 | return 0; |
94 | } | 97 | } |
95 | 98 | ||
96 | #define _AU0828_BULKPIPE 0x83 | ||
97 | #define _BULKPIPESIZE 0xe522 | ||
98 | |||
99 | static int start_urb_transfer(struct au0828_dev *dev) | 99 | static int start_urb_transfer(struct au0828_dev *dev) |
100 | { | 100 | { |
101 | struct urb *purb; | 101 | struct urb *purb; |
@@ -306,7 +306,7 @@ void au0828_dvb_unregister(struct au0828_dev *dev) | |||
306 | 306 | ||
307 | dprintk(1, "%s()\n", __func__); | 307 | dprintk(1, "%s()\n", __func__); |
308 | 308 | ||
309 | if(dvb->frontend == NULL) | 309 | if (dvb->frontend == NULL) |
310 | return; | 310 | return; |
311 | 311 | ||
312 | dvb_net_release(&dvb->net); | 312 | dvb_net_release(&dvb->net); |