diff options
| author | Felipe Balbi <felipe.balbi@nokia.com> | 2010-01-21 15:33:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 14:54:39 -0800 |
| commit | ad517e9ed8723363ebff0c5b413cbaa503aeb0ce (patch) | |
| tree | fca055ec045759e054b5d162c49874170c0bbb75 /drivers/usb/musb | |
| parent | 8573e6a673fc99bd89a6c08ef9841d8b52f9d3c5 (diff) | |
| download | kernel_samsung_smdk4412-ad517e9ed8723363ebff0c5b413cbaa503aeb0ce.zip kernel_samsung_smdk4412-ad517e9ed8723363ebff0c5b413cbaa503aeb0ce.tar.gz kernel_samsung_smdk4412-ad517e9ed8723363ebff0c5b413cbaa503aeb0ce.tar.bz2 | |
USB: musb: we already tested for dyn_fifo
... and even added a flag to struct musb, so let's
use that.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index a6dc18c..3e9b3b0 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1398,21 +1398,10 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) musb->nr_endpoints = 1; musb->epmask = 1; - if (reg & MUSB_CONFIGDATA_DYNFIFO) { - if (musb->config->dyn_fifo) - status = ep_config_from_table(musb); - else { - ERR("reconfigure software for Dynamic FIFOs\n"); - status = -ENODEV; - } - } else { - if (!musb->config->dyn_fifo) - status = ep_config_from_hw(musb); - else { - ERR("reconfigure software for static FIFOs\n"); - return -ENODEV; - } - } + if (musb->dyn_fifo) + status = ep_config_from_table(musb); + else + status = ep_config_from_hw(musb); if (status < 0) return status; |