usb: gadget: composite: Fix cdev null after rmmod

Avoid to disconnect gadget again after unbinding

bug 200141741
bug 200143079

Change-Id: I6fadcb4c5b5262d861a865f24ba2d8666e126923
Signed-off-by: Peter Chiang <pchiang@nvidia.com>
Reviewed-on: http://git-master/r/805175
Reviewed-on: http://git-master/r/819566
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Shreshtha Sahu <ssahu@nvidia.com>
Tested-by: Shreshtha Sahu <ssahu@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 310c0abd8ffce851602562c4375f2ab65e9e8d6f..90369f40d04602f331d43c6ef91993cd1a9144c2 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1536,6 +1536,9 @@ void composite_disconnect(struct usb_gadget *gadget)
        /* REVISIT:  should we have config and device level
         * disconnect callbacks?
         */
+       if (!cdev)
+               return;
+
        spin_lock_irqsave(&cdev->lock, flags);
        if (cdev->config)
                reset_config(cdev);