3.2.95-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Tim Gardner <[email protected]> commit 1f5353e765fe2a1168477bfe55e4dd7cdd96b477 upstream. Return an error from wm_hubs_read_dc_servo() if hubs->dcs_readback_mode is not correctly initialized. You might as well bail out since nothing is likely to work correctly afterwards. sound/soc/codecs/wm_hubs.c:321:11: warning: 'reg_r' may be used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm_hubs.c:251:13: note: 'reg_r' was declared here sound/soc/codecs/wm_hubs.c:322:11: warning: 'reg_l' may be used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm_hubs.c:251:6: note: 'reg_l' was declared here gcc version 4.6.3 Signed-off-by: Tim Gardner <[email protected]> Signed-off-by: Mark Brown <[email protected]> [bwh: Backported to 3.2: There's no separate wm_hubs_read_dc_servo() function, so return directly from calibrate_dc_servo().] Signed-off-by: Ben Hutchings <[email protected]> --- --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -173,7 +173,7 @@ static void calibrate_dc_servo(struct sn break; default: WARN(1, "Unknown DCS readback method\n"); - break; + return; } dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r);
