diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:58:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:58:58 -0300 |
| commit | 69357393e580dbcd400c7c1992b48813359eb417 (patch) | |
| tree | 27c962a692da9c36cdaa85814eddf5f833ffd777 /linux/drivers/media/dvb | |
| parent | c1320d2c77e66cf93a7b899cf3764a556c5bc3f9 (diff) | |
| parent | dd151ee816f6d89d08edda36da27880b88c32fae (diff) | |
| download | mediapointer-dvb-s2-69357393e580dbcd400c7c1992b48813359eb417.tar.gz mediapointer-dvb-s2-69357393e580dbcd400c7c1992b48813359eb417.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-bttv
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dst_ca.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dst_ca.c b/linux/drivers/media/dvb/bt8xx/dst_ca.c index e71c269c1..bdc22a467 100644 --- a/linux/drivers/media/dvb/bt8xx/dst_ca.c +++ b/linux/drivers/media/dvb/bt8xx/dst_ca.c @@ -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); |