]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (11255): dst_ca: fix compile warning.
authorHans Verkuil <hverkuil@xs4all.nl>
Sat, 28 Mar 2009 12:35:40 +0000 (09:35 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:43:44 +0000 (12:43 -0300)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/bt8xx/dst_ca.c

index 607d7387fb6f4ecb55dccbb824f37b40af1b205e..4601b059b2b20008b7b277f725ec66d207c83e42 100644 (file)
@@ -554,16 +554,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);