From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Tue, 14 Dec 2010 13:02:55 +0000 (+0100)
Subject: staging: ft1000: Fix kernel panic when use ioctl.
X-Git-Tag: MMI-PSA29.97-13-9~21393^2~21
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=91cda632ebc6ea84fd7a45efb6d4452c34985731;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: ft1000: Fix kernel panic when use ioctl.

During ioctl testing was observed kernel panic beuase
file->private_data pointer was not correctly set when
debugfs file was created. Add correct pointer setup.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index e39809229d46..149ba59f96bf 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/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);