This is a note to let you know that I've just added the patch titled
usb: musb: gadget: kill duplicate code in musb_gadget_queue()
to my gregkh-2.6 tree which can be found in directory form at:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
and in git form at:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/patches.git
The filename of this patch is:
usb-musb-gadget-kill-duplicate-code-in-musb_gadget_queue.patch
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
If this patch meets the merge guidelines for a bugfix, it should be
merged into Linus's tree before the next major kernel release.
If not, it will be merged into Linus's tree during the next merge window.
Either way, you will probably be copied on the patch when it gets sent
to Linus for merging so that others can see what is happening in kernel
development.
If you have any questions about this process, please let me know.
>From linux-usb-owner@xxxxxxxxxxxxxxx Tue Oct 5 13:30:26 2010
From: Felipe Balbi <balbi@xxxxxx>
To: Greg KH <greg@xxxxxxxxx>
Cc: Linux USB Mailing List <linux-usb@xxxxxxxxxxxxxxx>,
Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>,
Felipe Balbi <balbi@xxxxxx>
Subject: usb: musb: gadget: kill duplicate code in musb_gadget_queue()
Date: Fri, 24 Sep 2010 13:44:11 +0300
Message-Id: <1285325055-1247-11-git-send-email-balbi@xxxxxx>
From: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
I've noticed that musb_gadget_queue() checks for '!req->buf' condition twice:
in the second case the code is both duplicate and unreachable as the first
check returns early.
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/usb/musb/musb_gadget.c | 2 --
1 file changed, 2 deletions(-)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1214,8 +1214,6 @@ static int musb_gadget_queue(struct usb_
if (is_dma_capable() && musb_ep->dma)
map_dma_buffer(request, musb);
- else if (!req->buf)
- return -ENODATA;
else
request->mapped = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
