From 4fd4d7d8de0ade3da10f9d08506dca5b4ddf1245 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Thu, 17 May 2012 02:28:12 +0200 Subject: [PATCH] staging: iio: reorganize hmc5843_set_rate() Signed-off-by: Peter Meerwald Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/magnetometer/hmc5843.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c index 9216b07a855d..32f19b7493d9 100644 --- a/drivers/staging/iio/magnetometer/hmc5843.c +++ b/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); } -- 2.11.0