aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax/i2400m/usb.c
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky@linux.intel.com>2009-06-11 11:13:41 -0700
committerInaky Perez-Gonzalez <inaky@linux.intel.com>2009-06-11 11:47:39 -0700
commit98eb0f53e2fc66482e2ea8033c58b20a079e5260 (patch)
treed7bfd46772eb1da57cdb2f40e3e227186242bef6 /drivers/net/wimax/i2400m/usb.c
parentwimax: fix warning caused by not checking retval of rfkill_set_hw_state() (diff)
downloadlinux-dev-98eb0f53e2fc66482e2ea8033c58b20a079e5260.tar.xz
linux-dev-98eb0f53e2fc66482e2ea8033c58b20a079e5260.zip
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/usb.c')
-rw-r--r--drivers/net/wimax/i2400m/usb.c4
1 files changed, 3 insertions, 1 deletions
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) {