Merge branch 'rmobile-fixes-for-linus' into rmobile-latest

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-phy.c b/drivers/media/dvb/dvb-usb/mxl111sf-phy.c
index 91dc1fc2825b..b741b3a7a325 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf-phy.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-phy.c
@@ -296,8 +296,7 @@ int mxl111sf_config_spi(struct mxl111sf_state *state, int onoff)
                 goto fail;
 
         ret = mxl111sf_write_reg(state, 0x00, 0x00);
-        if (mxl_fail(ret))
-                goto fail;
+        mxl_fail(ret);
 fail:
         return ret;
 }
@@ -328,11 +327,13 @@ int mxl111sf_idac_config(struct mxl111sf_state *state,
                 /* set hysteresis value  reg: 0x0B<5:0> */
                 ret = mxl111sf_write_reg(state, V6_IDAC_HYSTERESIS_REG,
                                          (hysteresis_value & 0x3F));
+                mxl_fail(ret);
         }
 
         ret = mxl111sf_write_reg(state, V6_IDAC_SETTINGS_REG, val);
+        mxl_fail(ret);
 
-        return val;
+        return ret;
 }
 
 /*