aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky@linux.intel.com>2009-06-11 14:13:41 -0400
committerInaky Perez-Gonzalez <inaky@linux.intel.com>2009-06-11 14:47:39 -0400
commit98eb0f53e2fc66482e2ea8033c58b20a079e5260 (patch)
treed7bfd46772eb1da57cdb2f40e3e227186242bef6
parentd2f4c10544231c3681f937a1e511f4780b4b39af (diff)
wimax: fix gcc warnings in sh4 when calling BUG()
SH4's BUG() seems to confuse the compiler as it is considered to return; thus, some functions would trigger usage of uninitialized variables or non-void functions returning void. Work around by initializing/returning. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
-rw-r--r--drivers/net/wimax/i2400m/op-rfkill.c4
-rw-r--r--drivers/net/wimax/i2400m/usb.c4
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)
54 /* state == WIMAX_RF_ON */ 54 /* state == WIMAX_RF_ON */
55 return i2400m->state != I2400M_SS_RF_OFF 55 return i2400m->state != I2400M_SS_RF_OFF
56 && i2400m->state != I2400M_SS_RF_SHUTDOWN; 56 && i2400m->state != I2400M_SS_RF_SHUTDOWN;
57 else 57 else {
58 BUG(); 58 BUG();
59 return -EINVAL; /* shut gcc warnings on certain arches */
60 }
59} 61}
60 62
61 63
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:
254 dev_err(dev, "USB reset failed (%d), giving up!\n", 254 dev_err(dev, "USB reset failed (%d), giving up!\n",
255 result); 255 result);
256 } 256 }
257 } else 257 } else {
258 result = -EINVAL; /* shut gcc up in certain arches */
258 BUG(); 259 BUG();
260 }
259 if (result < 0 261 if (result < 0
260 && result != -EINVAL /* device is gone */ 262 && result != -EINVAL /* device is gone */
261 && rt != I2400M_RT_BUS) { 263 && rt != I2400M_RT_BUS) {