diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-07 11:09:09 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-07 11:09:35 -0400 |
| commit | 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd (patch) | |
| tree | 33c02b5e18e79756005a3edfa7c862a47de668d5 /drivers/usb/gadget/dummy_hcd.c | |
| parent | 4086b1e2b19729eebf632073b9d4ab811726d8eb (diff) | |
| parent | dc257cf154be708ecc47b8b89c12ad8cd2cc35e4 (diff) | |
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
Daniel prepared this branch with a back-merge as git was getting
very confused about changes in intel_display.c
Diffstat (limited to 'drivers/usb/gadget/dummy_hcd.c')
| -rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index a6dfd2164166..170cbe89d9f8 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
| @@ -927,7 +927,6 @@ static int dummy_udc_stop(struct usb_gadget *g, | |||
| 927 | 927 | ||
| 928 | dum->driver = NULL; | 928 | dum->driver = NULL; |
| 929 | 929 | ||
| 930 | dummy_pullup(&dum->gadget, 0); | ||
| 931 | return 0; | 930 | return 0; |
| 932 | } | 931 | } |
| 933 | 932 | ||