Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[mv-sheeva.git] / drivers / usb / input / hiddev.c

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 114d6c9f64b17175ffb0fc8d8edde27be24c507c..a8b3d66cd4988b6f133f8804de4a643faeabacc3 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -384,7 +384,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
        struct hiddev_list *list = file->private_data;
        struct hiddev *hiddev = list->hiddev;
        struct hid_device *hid = hiddev->hid;
-       struct usb_device *dev = to_usb_device(hid->dev);
+       struct usb_device *dev = hid_to_usb_dev(hid);
        struct hiddev_collection_info cinfo;
        struct hiddev_report_info rinfo;
        struct hiddev_field_info finfo;