From fca8e84d636227fe9081d82ef4e977669fd04dae Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Tue, 26 Feb 2013 15:15:27 +0200 Subject: [PATCH] --- yaml --- r: 364671 b: refs/heads/master c: e861c768e57fd74ff947eadcf8ff86c01ba170d6 h: refs/heads/master i: 364669: 48e3bb1ab75c3b3187c1c922c39bf17a120c686b 364667: 85f37f33166f8c00ceaa1305fb8307731e69b7e5 364663: 4db238d10252532ed6c415f4d05c7e78981a323f 364655: 77ea515017ea9c022a5c00d0a21f67ae7fca8f81 364639: 8c6eb78a13ed1cc307b54a6a449e28219665ec85 364607: 3a6fc88228f7f20e200223714fa35d9f043ad462 364543: 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/mv_udc_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 40a968a7377b..515ecec74075 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c9c3c7e1855e28d35c8d70607e68690def85fed +refs/heads/master: e861c768e57fd74ff947eadcf8ff86c01ba170d6 diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c index d1b243d76669..d278e8f512c0 100644 --- a/trunk/drivers/usb/gadget/mv_udc_core.c +++ b/trunk/drivers/usb/gadget/mv_udc_core.c @@ -2265,7 +2265,6 @@ static int mv_udc_probe(struct platform_device *pdev) udc->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */ /* the "gadget" abstracts/virtualizes the controller */ - udc->gadget.dev.release = gadget_release; udc->gadget.name = driver_name; /* gadget name */ eps_init(udc); @@ -2305,7 +2304,8 @@ static int mv_udc_probe(struct platform_device *pdev) else udc->vbus_active = 1; - retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget); + retval = usb_add_gadget_udc_release(&pdev->dev, &udc->gadget, + gadget_release); if (retval) goto err_create_workqueue;