diff --git a/[refs] b/[refs] index 8d02d65c5e65..b4e188314530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ddd9ec17af6a7c539f4a12758905340c00847d6 +refs/heads/master: a80d5ff0d7d3a99e962a02c36acf97ba5a70b86e diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c index 5580c6e59bae..54a350ccd033 100644 --- a/trunk/drivers/usb/core/devio.c +++ b/trunk/drivers/usb/core/devio.c @@ -552,14 +552,15 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, static int match_devt(struct device *dev, void *data) { - return (dev->devt == (dev_t) data); + return dev->devt == (dev_t) (unsigned long) data; } static struct usb_device *usbdev_lookup_by_devt(dev_t devt) { struct device *dev; - dev = bus_find_device(&usb_bus_type, NULL, (void *) devt, match_devt); + dev = bus_find_device(&usb_bus_type, NULL, + (void *) (unsigned long) devt, match_devt); if (!dev) return NULL; return container_of(dev, struct usb_device, dev);