Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / drivers / media / dvb / bt8xx / dst_ca.c

diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 770243c720d2e3d06a5fb733ff05ba505c0eb88b..cf87051628458efd1035b172d22c40f3b3e00c8a 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -565,7 +565,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
        int result = 0;
 
        lock_kernel();
-       dvbdev = (struct dvb_device *)file->private_data;
+       dvbdev = 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);