2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/wimax/i2400m/op-rfkill.c b/drivers/net/wimax/i2400m/op-rfkill.c
index 487ec58cea46..43927b5d7ad6 100644
--- a/drivers/net/wimax/i2400m/op-rfkill.c
+++ b/drivers/net/wimax/i2400m/op-rfkill.c
@@ -54,8 +54,10 @@ int i2400m_radio_is(struct i2400m *i2400m, enum wimax_rf_state state)
                 /* state == WIMAX_RF_ON */
                 return i2400m->state != I2400M_SS_RF_OFF
                         && i2400m->state != I2400M_SS_RF_SHUTDOWN;
-        else
+        else {
                 BUG();
+                return -EINVAL; /* shut gcc warnings on certain arches */
+        }
 }
 
 
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index ebc05da89687..cfdaf69da9d1 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -254,8 +254,10 @@ do_bus_reset:
                         dev_err(dev, "USB reset failed (%d), giving up!\n",
                                 result);
                 }
-        } else
+        } else {
+                result = -EINVAL;       /* shut gcc up in certain arches */
                 BUG();
+        }
         if (result < 0
             && result != -EINVAL        /* device is gone */
             && rt != I2400M_RT_BUS) {