diff --git a/[refs] b/[refs] index e307f50c095a..1fbf8323b1a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23a3b8cc9ce1bec3e21ca6e90566cf30caa760e5 +refs/heads/master: 685e010748f64a752a981254101e976d7291d16c diff --git a/trunk/drivers/staging/iio/dac/ad5360.c b/trunk/drivers/staging/iio/dac/ad5360.c index c5bf5827c137..012d7147e496 100644 --- a/trunk/drivers/staging/iio/dac/ad5360.c +++ b/trunk/drivers/staging/iio/dac/ad5360.c @@ -371,8 +371,8 @@ static int ad5360_read_raw(struct iio_dev *indio_dev, long m) { struct ad5360_state *st = iio_priv(indio_dev); - unsigned long scale_uv; unsigned int ofs_index; + int scale_uv; int ret; switch (m) {