diff options
| author | Sergei Shtylyov | 2010-09-24 12:44:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-22 19:21:55 +0200 |
| commit | 434678685407e045ffb246df059c486fc0a16e75 (patch) | |
| tree | f7b76883c3dfe7ce564cd6bffd64d0d1dad27229 /drivers | |
| parent | USB: musb: suppress warning about unused flags (diff) | |
| download | kernel-qcow2-linux-434678685407e045ffb246df059c486fc0a16e75.tar.gz kernel-qcow2-linux-434678685407e045ffb246df059c486fc0a16e75.tar.xz kernel-qcow2-linux-434678685407e045ffb246df059c486fc0a16e75.zip | |
usb: musb: gadget: kill unreachable code in musb_g_rx()
musb_g_rx() always returns if next_request() call yields NULL, so the DBG()
near the function's end can never be invoked. Remove it along with unneeded
'return'; also remove the duplicate 'request' check...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index f497586e36ec..6a8c061b66f1 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -775,7 +775,7 @@ void musb_g_rx(struct musb *musb, u8 epnum) musb_writew(epio, MUSB_RXCSR, csr); DBG(3, "%s iso overrun on %p\n", musb_ep->name, request); - if (request && request->status == -EINPROGRESS) + if (request->status == -EINPROGRESS) request->status = -EOVERFLOW; } if (csr & MUSB_RXCSR_INCOMPRX) { @@ -828,14 +828,8 @@ void musb_g_rx(struct musb *musb, u8 epnum) return; } - /* analyze request if the ep is hot */ - if (request) - rxstate(musb, to_musb_request(request)); - else - DBG(3, "packet waiting for %s%s request\n", - musb_ep->desc ? "" : "inactive ", - musb_ep->end_point.name); - return; + /* Analyze request */ + rxstate(musb, to_musb_request(request)); } /* ------------------------------------------------------------ */ |