forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
d2f4c10544
commit
98eb0f53e2
|
@ -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 */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user