diff options
author | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 15:30:29 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 15:30:29 +0200 |
commit | 6182fd6b90ca685cf0261069f0f899a5ad224642 (patch) | |
tree | 090125befb684bef2296629e4ae3480861666cc6 /drivers | |
parent | 9f582df2a00f8cb3846624e6d092c368a907320c (diff) | |
parent | 4d5c2d2930e934c36a7ab554f4b307801c8ebf7f (diff) |
Merge branch 'upstream' into mm
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/usbhid/hiddev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 9c8d15634472..842e9edb888e 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -763,7 +763,6 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) #ifdef CONFIG_COMPAT static long hiddev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct inode *inode = file->f_path.dentry->d_inode; return hiddev_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); } #endif |