Merge branch 'master' into for-linus

[karo-tx-linux.git] / drivers / isdn / i4l / isdn_ppp.c

diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 8c46baee621b7e0617ea1e1b1ca7a296f7270c45..fe824e0cbb252cedda78527fac18f2a40876a9df 100644 (file)
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -477,7 +477,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
        struct isdn_ppp_comp_data data;
        void __user *argp = (void __user *)arg;
 
-       is = (struct ippp_struct *) file->private_data;
+       is = file->private_data;
        lp = is->lp;
 
        if (is->debug & 0x1)