From fc1f961b41cdb00afd5174d804c09439a993493c Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 24 Jan 2013 16:37:24 +0200 Subject: [PATCH] --- yaml --- r: 364551 b: refs/heads/master c: 7a071890b467e3b820b6afb13f2a877a249ae8f9 h: refs/heads/master i: 364549: b9dd104358429bfb0fa8dcbc608e9222a2a6767a 364547: 06f5b699a5ca83221cf4de1f2dffdb45a7f305ac 364543: 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/mv_u3d_core.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index fb9eac49c187..fadc257b1670 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96d20c32f68b058b4430a6f711124511a2d9b361 +refs/heads/master: 7a071890b467e3b820b6afb13f2a877a249ae8f9 diff --git a/trunk/drivers/usb/gadget/mv_u3d_core.c b/trunk/drivers/usb/gadget/mv_u3d_core.c index b5cea273c957..565addcd3956 100644 --- a/trunk/drivers/usb/gadget/mv_u3d_core.c +++ b/trunk/drivers/usb/gadget/mv_u3d_core.c @@ -1792,8 +1792,6 @@ static int mv_u3d_remove(struct platform_device *dev) clk_put(u3d->clk); - device_unregister(&u3d->gadget.dev); - platform_set_drvdata(dev, NULL); kfree(u3d); @@ -1957,15 +1955,11 @@ static int mv_u3d_probe(struct platform_device *dev) u3d->gadget.speed = USB_SPEED_UNKNOWN; /* speed */ /* the "gadget" abstracts/virtualizes the controller */ - dev_set_name(&u3d->gadget.dev, "gadget"); u3d->gadget.dev.parent = &dev->dev; u3d->gadget.dev.dma_mask = dev->dev.dma_mask; u3d->gadget.dev.release = mv_u3d_gadget_release; u3d->gadget.name = driver_name; /* gadget name */ - - retval = device_register(&u3d->gadget.dev); - if (retval) - goto err_register_gadget_device; + u3d->gadget.register_my_device = true; mv_u3d_eps_init(u3d); @@ -1991,8 +1985,6 @@ static int mv_u3d_probe(struct platform_device *dev) return 0; err_unregister: - device_unregister(&u3d->gadget.dev); -err_register_gadget_device: free_irq(u3d->irq, &dev->dev); err_request_irq: err_get_irq: