From 41836210203ac9516513f0d72117af8446a33800 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Tue, 14 Dec 2010 14:02:55 +0100 Subject: [PATCH] --- yaml --- r: 228384 b: refs/heads/master c: 91cda632ebc6ea84fd7a45efb6d4452c34985731 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fd53b25785ac..8ffbc6cc0c8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ce72ea3b2f29e5755b095a5b217b9bab8386a03 +refs/heads/master: 91cda632ebc6ea84fd7a45efb6d4452c34985731 diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c index e39809229d46..149ba59f96bf 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c @@ -174,7 +174,7 @@ int ft1000_create_dev(struct ft1000_device *dev) } file = debugfs_create_file("device", S_IRUGO | S_IWUSR, dir, - NULL, &ft1000fops); + dev, &ft1000fops); if (IS_ERR(file)) { result = PTR_ERR(file); goto debug_file_fail; @@ -398,7 +398,6 @@ static long ft1000_ioctl (struct file *file, unsigned int command, unsigned long argument) { void __user *argp = (void __user *)argument; - struct net_device *dev; struct ft1000_info *info; struct ft1000_device *ft1000dev; int result=0; @@ -428,9 +427,8 @@ static long ft1000_ioctl (struct file *file, unsigned int command, //DEBUG("FT1000:ft1000_ioctl:command = 0x%x argument = 0x%8x\n", command, (u32)argument); - dev = file->private_data; - info = netdev_priv(dev); - ft1000dev = info->pFt1000Dev; + info = file->private_data; + ft1000dev = info->pFt1000Dev; cmd = _IOC_NR(command); //DEBUG("FT1000:ft1000_ioctl:cmd = 0x%x\n", cmd);