USB: inode.c: move assignment out of if () block

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / legacy / inode.c

diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 6af58c6dba5ebe7ea134197537864b95c8bfe002..f454c7af489ce050dba446a1a5a6b292ad179644 100644 (file)
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -769,9 +769,12 @@ ep_config (struct ep_data *data, const char *buf, size_t len)
        if (data->dev->state == STATE_DEV_UNBOUND) {
                value = -ENOENT;
                goto gone;
-       } else if ((ep = data->ep) == NULL) {
-               value = -ENODEV;
-               goto gone;
+       } else {
+               ep = data->ep;
+               if (ep == NULL) {
+                       value = -ENODEV;
+                       goto gone;
+               }
        }
        switch (data->dev->gadget->speed) {
        case USB_SPEED_LOW:
@@ -1505,7 +1508,7 @@ static void destroy_ep_files (struct dev_data *dev)
                list_del_init (&ep->epfiles);
                dentry = ep->dentry;
                ep->dentry = NULL;
-               parent = dentry->d_parent->d_inode;
+               parent = d_inode(dentry->d_parent);
 
                /* break link to controller */
                if (ep->state == STATE_EP_ENABLED)