diff options
| author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-11 22:13:41 +0400 |
|---|---|---|
| committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-11 22:47:39 +0400 |
| commit | 98eb0f53e2fc66482e2ea8033c58b20a079e5260 (patch) | |
| tree | d7bfd46772eb1da57cdb2f40e3e227186242bef6 /drivers/net/wimax/i2400m | |
| parent | d2f4c10544231c3681f937a1e511f4780b4b39af (diff) | |
| download | linux-98eb0f53e2fc66482e2ea8033c58b20a079e5260.tar.xz | |
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>
Diffstat (limited to 'drivers/net/wimax/i2400m')
| -rw-r--r-- | drivers/net/wimax/i2400m/op-rfkill.c | 4 | ||||
| -rw-r--r-- | drivers/net/wimax/i2400m/usb.c | 4 |
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) { |