aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/siano/smsdvb.c12
-rw-r--r--drivers/media/dvb/siano/smsusb.c5
2 files changed, 10 insertions, 7 deletions
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 717e0e97fd1f..6975e7c61f87 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -32,12 +32,13 @@ kmutex_t g_smsdvb_clientslock;
32int smsdvb_onresponse(void *context, smscore_buffer_t *cb) 32int smsdvb_onresponse(void *context, smscore_buffer_t *cb)
33{ 33{
34 smsdvb_client_t *client = (smsdvb_client_t *) context; 34 smsdvb_client_t *client = (smsdvb_client_t *) context;
35 SmsMsgHdr_ST *phdr = (SmsMsgHdr_ST *)(((u8*) cb->p) + cb->offset); 35 SmsMsgHdr_ST *phdr = (SmsMsgHdr_ST *)(((u8 *) cb->p) + cb->offset);
36 36
37 switch(phdr->msgType) 37 switch(phdr->msgType)
38 { 38 {
39 case MSG_SMS_DVBT_BDA_DATA: 39 case MSG_SMS_DVBT_BDA_DATA:
40 dvb_dmx_swfilter(&client->demux, (u8*)(phdr + 1), cb->size - sizeof(SmsMsgHdr_ST)); 40 dvb_dmx_swfilter(&client->demux, (u8 *)(phdr + 1),
41 cb->size - sizeof(SmsMsgHdr_ST));
41 break; 42 break;
42 43
43 case MSG_SMS_RF_TUNE_RES: 44 case MSG_SMS_RF_TUNE_RES:
@@ -46,7 +47,8 @@ int smsdvb_onresponse(void *context, smscore_buffer_t *cb)
46 47
47 case MSG_SMS_GET_STATISTICS_RES: 48 case MSG_SMS_GET_STATISTICS_RES:
48 { 49 {
49 SmsMsgStatisticsInfo_ST* p = (SmsMsgStatisticsInfo_ST*)(phdr + 1); 50 SmsMsgStatisticsInfo_ST *p =
51 (SmsMsgStatisticsInfo_ST *)(phdr + 1);
50 52
51 if (p->Stat.IsDemodLocked) 53 if (p->Stat.IsDemodLocked)
52 { 54 {
@@ -97,7 +99,7 @@ void smsdvb_onremove(void *context)
97{ 99{
98 kmutex_lock(&g_smsdvb_clientslock); 100 kmutex_lock(&g_smsdvb_clientslock);
99 101
100 smsdvb_unregister_client((smsdvb_client_t*) context); 102 smsdvb_unregister_client((smsdvb_client_t *) context);
101 103
102 kmutex_unlock(&g_smsdvb_clientslock); 104 kmutex_unlock(&g_smsdvb_clientslock);
103} 105}
@@ -420,7 +422,7 @@ void smsdvb_unregister(void)
420 kmutex_lock(&g_smsdvb_clientslock); 422 kmutex_lock(&g_smsdvb_clientslock);
421 423
422 while (!list_empty(&g_smsdvb_clients)) 424 while (!list_empty(&g_smsdvb_clients))
423 smsdvb_unregister_client((smsdvb_client_t*) g_smsdvb_clients.next); 425 smsdvb_unregister_client((smsdvb_client_t *) g_smsdvb_clients.next);
424 426
425 kmutex_unlock(&g_smsdvb_clientslock); 427 kmutex_unlock(&g_smsdvb_clientslock);
426 428
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 87dda39a7985..1677f8591508 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -86,7 +86,8 @@ void smsusb_onresponse(struct urb *urb)
86 } 86 }
87 87
88 // move buffer pointer and copy header to its new location 88 // move buffer pointer and copy header to its new location
89 memcpy((char*) phdr + surb->cb->offset, phdr, sizeof(SmsMsgHdr_ST)); 89 memcpy((char *) phdr + surb->cb->offset,
90 phdr, sizeof(SmsMsgHdr_ST));
90 } 91 }
91 else 92 else
92 surb->cb->offset = 0; 93 surb->cb->offset = 0;
@@ -264,7 +265,7 @@ int smsusb1_setmode(void *context, int mode)
264 265
265void smsusb_term_device(struct usb_interface *intf) 266void smsusb_term_device(struct usb_interface *intf)
266{ 267{
267 smsusb_device_t *dev = (smsusb_device_t*) usb_get_intfdata(intf); 268 smsusb_device_t *dev = (smsusb_device_t *) usb_get_intfdata(intf);
268 269
269 if (dev) 270 if (dev)
270 { 271 {