summaryrefslogtreecommitdiff
path: root/drivers/iio/light
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-24 22:06:37 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-24 22:06:37 +0400
commit912cbd495204ee6fcb67b8704ffbda10615d1f2f (patch)
tree1053bc0bf681a7a4448b5344dddb5f425e0b7920 /drivers/iio/light
parent1785faacf3ac245f5e8d920197cd09a65a68f17f (diff)
parent413541dd66d51f791a0b169d9b9014e4f56be13c (diff)
downloadlinux-912cbd495204ee6fcb67b8704ffbda10615d1f2f.tar.xz
Merge 3.13-rc5 into staging-next
This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light')
-rw-r--r--drivers/iio/light/cm36651.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/light/cm36651.c b/drivers/iio/light/cm36651.c
index 21df57130018..0922e39b0ea9 100644
--- a/drivers/iio/light/cm36651.c
+++ b/drivers/iio/light/cm36651.c
@@ -387,7 +387,7 @@ static int cm36651_read_int_time(struct cm36651_data *cm36651,
return -EINVAL;
}
- return IIO_VAL_INT_PLUS_MICRO;
+ return IIO_VAL_INT;
}
static int cm36651_write_int_time(struct cm36651_data *cm36651,