1 files changed, 4 insertions, 15 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index a6dc18cde27b..3e9b3b0e9c0d 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;