diff options
| author | Greg Kroah-Hartman | 2022-01-03 13:02:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2022-01-03 13:02:29 +0100 |
| commit | e681a9d2050cdcaf24adeabc9f1aea6cff94be22 (patch) | |
| tree | 5dccb613fdadb3f792bfedc0c224581d1b3e7a73 /drivers/usb/gadget | |
| parent | db3e8244bd1c46f5a416fd1e6821036ecc59884a (diff) | |
| parent | c9e6606c7fe92b50a02ce51dda82586ebdf99b48 (diff) | |
Merge 5.16-rc8 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 3c584da9118c..25ad1e97a458 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -1773,11 +1773,15 @@ static void ffs_data_clear(struct ffs_data *ffs) BUG_ON(ffs->gadget); - if (ffs->epfiles) + if (ffs->epfiles) { ffs_epfiles_destroy(ffs->epfiles, ffs->eps_count); + ffs->epfiles = NULL; + } - if (ffs->ffs_eventfd) + if (ffs->ffs_eventfd) { eventfd_ctx_put(ffs->ffs_eventfd); + ffs->ffs_eventfd = NULL; + } kfree(ffs->raw_descs_data); kfree(ffs->raw_strings); @@ -1790,7 +1794,6 @@ static void ffs_data_reset(struct ffs_data *ffs) ffs_data_clear(ffs); - ffs->epfiles = NULL; ffs->raw_descs_data = NULL; ffs->raw_descs = NULL; ffs->raw_strings = NULL; |