OSDN Git Service

staging: iio: reorganize hmc5843_set_rate()
authorPeter Meerwald <pmeerw@pmeerw.net>
Thu, 17 May 2012 00:28:12 +0000 (02:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 May 2012 15:24:56 +0000 (08:24 -0700)
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/iio/magnetometer/hmc5843.c

index 9216b07..32f19b7 100644 (file)
@@ -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);
 }