diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-07 16:05:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-07 16:05:46 -0700 |
| commit | 1cd138bdcb17abd2c7ac4f7cac3b2647928d5123 (patch) | |
| tree | 858caeb10d9b496ec7e4aabb17c3b999b4728cb2 /drivers/usb/gadget/function | |
| parent | 1da237c93bbfac333ba49398c5c85393829b5474 (diff) | |
| parent | f9979adc6de83b0a795aafc81d283eb2216c5f4a (diff) | |
Merge "usb: gadget: f_mass_storage: Perform async runtime suspend after ep disable"
Diffstat (limited to 'drivers/usb/gadget/function')
| -rw-r--r-- | drivers/usb/gadget/function/f_mass_storage.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 1fd5a95b6e99..59d6ac67d072 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -2284,16 +2284,15 @@ reset: fsg->bulk_out_enabled = 0; } + /* allow usb LPM after eps are disabled */ + usb_gadget_autopm_put_async(common->gadget); common->fsg = NULL; wake_up(&common->fsg_wait); } common->running = 0; - if (!new_fsg || rc) { - /* allow usb LPM after eps are disabled */ - usb_gadget_autopm_put_async(common->gadget); + if (!new_fsg || rc) return rc; - } common->fsg = new_fsg; fsg = common->fsg; |