From c3e0beea750876923930f542d25f5c89a0dbbfc5 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Thu, 17 May 2012 02:28:09 +0200 Subject: [PATCH] --- yaml --- r: 304746 b: refs/heads/master c: e278df1c82144f796fbeb5d9148ce09d544179a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/magnetometer/hmc5843.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf81b0b7e0c4..7346ed855cbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13f6eb69b15beeeaa720293c1281a14413363876 +refs/heads/master: e278df1c82144f796fbeb5d9148ce09d544179a4 diff --git a/trunk/drivers/staging/iio/magnetometer/hmc5843.c b/trunk/drivers/staging/iio/magnetometer/hmc5843.c index cf2bab848717..d25b06ef8075 100644 --- a/trunk/drivers/staging/iio/magnetometer/hmc5843.c +++ b/trunk/drivers/staging/iio/magnetometer/hmc5843.c @@ -281,9 +281,14 @@ static ssize_t hmc5843_set_measurement_configuration(struct device *dev, struct i2c_client *client = to_i2c_client(indio_dev->dev.parent); struct hmc5843_data *data = iio_priv(indio_dev); unsigned long meas_conf = 0; - int error = kstrtoul(buf, 10, &meas_conf); + int error; + + error = kstrtoul(buf, 10, &meas_conf); if (error) return error; + if (meas_conf >= HMC5843_MEAS_CONF_NOT_USED) + return -EINVAL; + mutex_lock(&data->lock); dev_dbg(dev, "set mode to %lu\n", meas_conf);