diff --git a/[refs] b/[refs] index 77fb8d696000..e307f50c095a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8a9f8056f40f6201b84fdddb49a1c62630902c5 +refs/heads/master: 23a3b8cc9ce1bec3e21ca6e90566cf30caa760e5 diff --git a/trunk/drivers/staging/iio/dac/ad5064.c b/trunk/drivers/staging/iio/dac/ad5064.c index a701063a9267..867e4ab1ff63 100644 --- a/trunk/drivers/staging/iio/dac/ad5064.c +++ b/trunk/drivers/staging/iio/dac/ad5064.c @@ -280,8 +280,8 @@ static int ad5064_read_raw(struct iio_dev *indio_dev, long m) { struct ad5064_state *st = iio_priv(indio_dev); - unsigned long scale_uv; unsigned int vref; + int scale_uv; switch (m) { case 0: