aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/devio.c2
-rw-r--r--drivers/usb/core/inode.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 218621b9958e..32e03000420c 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -555,7 +555,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
555 if (imajor(inode) == USB_DEVICE_MAJOR) 555 if (imajor(inode) == USB_DEVICE_MAJOR)
556 dev = usbdev_lookup_minor(iminor(inode)); 556 dev = usbdev_lookup_minor(iminor(inode));
557 if (!dev) 557 if (!dev)
558 dev = inode->u.generic_ip; 558 dev = inode->i_private;
559 if (!dev) { 559 if (!dev) {
560 kfree(ps); 560 kfree(ps);
561 goto out; 561 goto out;
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 3182c2224ba2..482f253085e5 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -402,8 +402,8 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
402 402
403static int default_open (struct inode *inode, struct file *file) 403static int default_open (struct inode *inode, struct file *file)
404{ 404{
405 if (inode->u.generic_ip) 405 if (inode->i_private)
406 file->private_data = inode->u.generic_ip; 406 file->private_data = inode->i_private;
407 407
408 return 0; 408 return 0;
409} 409}
@@ -509,7 +509,7 @@ static struct dentry *fs_create_file (const char *name, mode_t mode,
509 } else { 509 } else {
510 if (dentry->d_inode) { 510 if (dentry->d_inode) {
511 if (data) 511 if (data)
512 dentry->d_inode->u.generic_ip = data; 512 dentry->d_inode->i_private = data;
513 if (fops) 513 if (fops)
514 dentry->d_inode->i_fop = fops; 514 dentry->d_inode->i_fop = fops;
515 dentry->d_inode->i_uid = uid; 515 dentry->d_inode->i_uid = uid;