The patch number 11255 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
dst_ca: fix compile warning.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/dvb/bt8xx/dst_ca.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff -r 70909ac69e5f -r af824bd79bd8 linux/drivers/media/dvb/bt8xx/dst_ca.c
--- a/linux/drivers/media/dvb/bt8xx/dst_ca.c Sat Mar 28 13:32:42 2009 +0100
+++ b/linux/drivers/media/dvb/bt8xx/dst_ca.c Sat Mar 28 13:35:40 2009 +0100
@@ -650,16 +650,17 @@ free_mem_and_exit:
static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long
ioctl_arg)
{
- lock_kernel();
-
- struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
- struct dst_state* state = (struct dst_state*) dvbdev->priv;
+ struct dvb_device *dvbdev;
+ struct dst_state *state;
struct ca_slot_info *p_ca_slot_info;
struct ca_caps *p_ca_caps;
struct ca_msg *p_ca_message;
void __user *arg = (void __user *)ioctl_arg;
int result = 0;
+ lock_kernel();
+ dvbdev = (struct dvb_device *)file->private_data;
+ state = (struct dst_state *)dvbdev->priv;
p_ca_message = kmalloc(sizeof (struct ca_msg), GFP_KERNEL);
p_ca_slot_info = kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL);
p_ca_caps = kmalloc(sizeof (struct ca_caps), GFP_KERNEL);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/af824bd79bd8272237e6dc3e5ca2e2673e710041
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
