diff --git a/[refs] b/[refs] index e6c94f7c9f50..3804b762596a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 359f9caa4df27ca0546a787d086f4c06306300b6 +refs/heads/master: 3b724ca14565747926c23af1fa1afb1848c3f448 diff --git a/trunk/drivers/staging/iio/accel/sca3000_core.c b/trunk/drivers/staging/iio/accel/sca3000_core.c index 94bfe05e39f5..12ee6f8d375a 100644 --- a/trunk/drivers/staging/iio/accel/sca3000_core.c +++ b/trunk/drivers/staging/iio/accel/sca3000_core.c @@ -383,10 +383,10 @@ sca3000_store_measurement_mode(struct device *dev, struct sca3000_state *st = iio_priv(indio_dev); int ret; int mask = 0x03; - long val; + u8 val; mutex_lock(&st->lock); - ret = strict_strtol(buf, 10, &val); + ret = kstrtou8(buf, 10, &val); if (ret) goto error_ret; ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);