From 6498cd3c0d7fb832276ea2a4283e88e49f4d22fc Mon Sep 17 00:00:00 2001
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Thu, 11 Jun 2009 11:13:41 -0700
Subject: [PATCH] --- yaml --- r: 150887 b: refs/heads/master c:
 98eb0f53e2fc66482e2ea8033c58b20a079e5260 h: refs/heads/master i:   150885:
 5d5e0229d6afd1fd5950e3bf77f0197f637b2e7f   150883:
 7988b0503fa0822cbb1f75f9f05fa3ca01879e25   150879:
 3061cf9b3d0c13e1828989d5230c06db9c2c57bf v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wimax/i2400m/op-rfkill.c | 4 +++-
 trunk/drivers/net/wimax/i2400m/usb.c       | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc4bac393b38..fe96ad7ea43e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2f4c10544231c3681f937a1e511f4780b4b39af
+refs/heads/master: 98eb0f53e2fc66482e2ea8033c58b20a079e5260
diff --git a/trunk/drivers/net/wimax/i2400m/op-rfkill.c b/trunk/drivers/net/wimax/i2400m/op-rfkill.c
index 487ec58cea46..43927b5d7ad6 100644
--- a/trunk/drivers/net/wimax/i2400m/op-rfkill.c
+++ b/trunk/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/trunk/drivers/net/wimax/i2400m/usb.c b/trunk/drivers/net/wimax/i2400m/usb.c
index ebc05da89687..cfdaf69da9d1 100644
--- a/trunk/drivers/net/wimax/i2400m/usb.c
+++ b/trunk/drivers/net/wimax/i2400m/usb.c
@@ -254,8 +254,10 @@ int i2400mu_bus_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)
 			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) {