From: Jules Maselbas <jmaselbas@kalray.eu>
To: barebox@lists.infradead.org
Cc: Jules Maselbas <jmaselbas@kalray.eu>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 2/2] fixup! usb: gadget: dfu: Wrap fs operation in workqueue
Date: Mon, 1 Mar 2021 10:30:40 +0100 [thread overview]
Message-ID: <20210301093040.1721-2-jmaselbas@kalray.eu> (raw)
In-Reply-To: <20210301093040.1721-1-jmaselbas@kalray.eu>
Simplify the state handle, the idle state will only be entered
from do_close.
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
---
drivers/usb/gadget/dfu.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/dfu.c b/drivers/usb/gadget/dfu.c
index 3234f25b3..1dc659953 100644
--- a/drivers/usb/gadget/dfu.c
+++ b/drivers/usb/gadget/dfu.c
@@ -320,6 +320,8 @@ static void dfu_do_close(struct dfu_work *dw)
if (!stat(DFU_TEMPFILE, &s))
unlink(DFU_TEMPFILE);
+
+ dw->dfu->dfu_state = DFU_STATE_dfuIDLE;
}
static void dfu_do_copy(struct dfu_work *dw)
@@ -756,11 +758,8 @@ static int dfu_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
case DFU_STATE_dfuMANIFEST_SYNC:
switch (ctrl->bRequest) {
case USB_REQ_DFU_GETSTATUS:
+ dfu->dfu_state = DFU_STATE_dfuMANIFEST;
value = dfu_status(f, ctrl);
- if (dfu_file_entry->flags & FILE_LIST_FLAG_SAFE)
- dfu->dfu_state = DFU_STATE_dfuMANIFEST;
- else
- dfu->dfu_state = DFU_STATE_dfuIDLE;
value = min(value, w_length);
break;
case USB_REQ_DFU_GETSTATE:
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-03-01 9:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 16:34 [PATCH 1/3] usb: gadget: dfu: Use func_to_dfu Jules Maselbas
2021-02-08 16:34 ` [PATCH 2/3] usb: gadget: dfu: Wrap fs operation in workqueue Jules Maselbas
2021-02-15 14:18 ` [PATCH v2 1/2] usb: gadget: dfu: Rework print messages Jules Maselbas
2021-02-15 14:18 ` [PATCH v2 2/2] usb: gadget: dfu: Wrap fs operation in workqueue Jules Maselbas
2021-03-01 9:30 ` [PATCH 1/2] fixup! " Jules Maselbas
2021-03-01 9:30 ` Jules Maselbas [this message]
2021-03-01 16:03 ` Sascha Hauer
2021-03-01 16:06 ` Jules Maselbas
2021-02-16 9:19 ` [PATCH v2 1/2] usb: gadget: dfu: Rework print messages Bartosz Bilas
2021-02-16 9:27 ` Sascha Hauer
2021-02-16 9:51 ` Jules Maselbas
2021-02-16 9:49 ` Jules Maselbas
2021-02-08 16:34 ` [PATCH 3/3] usb: gadget: dfu: Replace printf with pr_err Jules Maselbas
2021-02-10 9:51 ` Ahmad Fatoum
2021-02-10 9:44 ` [PATCH 1/3] usb: gadget: dfu: Use func_to_dfu Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210301093040.1721-2-jmaselbas@kalray.eu \
--to=jmaselbas@kalray.eu \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox