summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-28 13:35:40 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-03-28 13:35:40 +0100
commit7c6ce73528aae8f96ce13949569a1776d67adb6d (patch)
tree3452f53e42ae50fd24c730d50f7f9d9f24fb14f4
parent3305a86bb709837ebcd4aa345c53d6b02c8566c6 (diff)
downloadmediapointer-dvb-s2-7c6ce73528aae8f96ce13949569a1776d67adb6d.tar.gz
mediapointer-dvb-s2-7c6ce73528aae8f96ce13949569a1776d67adb6d.tar.bz2
dst_ca: fix compile warning.
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--linux/drivers/media/dvb/bt8xx/dst_ca.c9
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);