summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/udc-core.c
diff options
context:
space:
mode:
authorFelipe Balbi2013-02-26 14:25:41 +0100
committerFelipe Balbi2013-03-18 10:17:56 +0100
commitddf47ccbfebc12add813cf729ecfc2d5ab59ca19 (patch)
tree98ab07310f361562b7f9644ea96608e624c965f6 /drivers/usb/gadget/udc-core.c
parentusb: renesas: gadget: don't assign gadget.dev.release directly (diff)
downloadkernel-qcow2-linux-ddf47ccbfebc12add813cf729ecfc2d5ab59ca19.tar.gz
kernel-qcow2-linux-ddf47ccbfebc12add813cf729ecfc2d5ab59ca19.tar.xz
kernel-qcow2-linux-ddf47ccbfebc12add813cf729ecfc2d5ab59ca19.zip
usb: gadget: udc-core: remove protection when setting gadget.dev.release
now that no UDC driver touches gadget.dev.release we can assign our release function to it without being afraid of breaking anything. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/udc-core.c')
-rw-r--r--drivers/usb/gadget/udc-core.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index a50811e35bdb..26e116bd6f59 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -198,12 +198,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
gadget->dev.dma_parms = parent->dma_parms;
gadget->dev.dma_mask = parent->dma_mask;
- if (release) {
+ if (release)
gadget->dev.release = release;
- } else {
- if (!gadget->dev.release)
- gadget->dev.release = usb_udc_nop_release;
- }
+ else
+ gadget->dev.release = usb_udc_nop_release;
ret = device_register(&gadget->dev);
if (ret)