diff --git a/[refs] b/[refs] index 551b04880202..acb6604a73f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4906a15c037f423b711ed2927836568264761927 +refs/heads/master: 4fd4d7d8de0ade3da10f9d08506dca5b4ddf1245 diff --git a/trunk/drivers/staging/iio/magnetometer/hmc5843.c b/trunk/drivers/staging/iio/magnetometer/hmc5843.c index 9216b07a855d..32f19b7493d9 100644 --- a/trunk/drivers/staging/iio/magnetometer/hmc5843.c +++ b/trunk/drivers/staging/iio/magnetometer/hmc5843.c @@ -343,12 +343,13 @@ static s32 hmc5843_set_rate(struct i2c_client *client, struct hmc5843_data *data = iio_priv(indio_dev); u8 reg_val; - reg_val = (data->meas_conf) | (rate << HMC5843_RATE_OFFSET); if (rate >= HMC5843_RATE_NOT_USED) { dev_err(&client->dev, "data output rate is not supported\n"); return -EINVAL; } + + reg_val = data->meas_conf | (rate << HMC5843_RATE_OFFSET); return i2c_smbus_write_byte_data(client, HMC5843_CONFIG_REG_A, reg_val); }