diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-08 12:14:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 12:14:50 +1000 |
| commit | bb0f78dd7ded88082b2430c43c65bc821c4ea360 (patch) | |
| tree | 715cdc73d1cdc145074ba76aa1765a4f7cf9b0c1 /drivers/gpu/drm/drm_usb.c | |
| parent | 62cd2fa82a38cb3d653517822c62a39cdbb5f365 (diff) | |
| parent | 677d23b70bf949f75746c80cbae92c233c6b5e2a (diff) | |
Merge branch 'udl-fixes' into drm-next
Fixes for usb/udl devices
* udl-fixes:
drm/udl: disable fb_defio by default
drm/udl: Inline memcmp() for RLE compression of xfer
drm/udl: make usage as a console safer
drm/usb: bind driver to correct device
Diffstat (limited to 'drivers/gpu/drm/drm_usb.c')
| -rw-r--r-- | drivers/gpu/drm/drm_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c index 3cec3061141..34a156f0c33 100644 --- a/drivers/gpu/drm/drm_usb.c +++ b/drivers/gpu/drm/drm_usb.c @@ -18,7 +18,7 @@ int drm_get_usb_dev(struct usb_interface *interface, usbdev = interface_to_usbdev(interface); dev->usbdev = usbdev; - dev->dev = &usbdev->dev; + dev->dev = &interface->dev; mutex_lock(&drm_global_mutex); |