From cc88c19b34eb746c71664228e815d51aa010b065 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Mon, 16 Apr 2012 21:27:42 +0530 Subject: [PATCH] --- yaml --- r: 304360 b: refs/heads/master c: 892cb6dc9fbbfa7281f3aa53aa6599618aec7cb1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/light/isl29028.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c8f5634ffcc..b92c0ece6d1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5714b5acfb0ea7816340ba37bb8631c7061448e +refs/heads/master: 892cb6dc9fbbfa7281f3aa53aa6599618aec7cb1 diff --git a/trunk/drivers/staging/iio/light/isl29028.c b/trunk/drivers/staging/iio/light/isl29028.c index e705e45bbf63..4e6ac24d7c79 100644 --- a/trunk/drivers/staging/iio/light/isl29028.c +++ b/trunk/drivers/staging/iio/light/isl29028.c @@ -272,7 +272,7 @@ static int isl29028_write_raw(struct iio_dev *indio_dev, mutex_lock(&chip->lock); switch (chan->type) { case IIO_PROXIMITY: - if (mask != IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT) { + if (mask != IIO_CHAN_INFO_SAMP_FREQ) { dev_err(chip->dev, "proximity: mask value 0x%08lx not supported\n", mask); @@ -294,7 +294,7 @@ static int isl29028_write_raw(struct iio_dev *indio_dev, break; case IIO_LIGHT: - if (mask != IIO_CHAN_INFO_SCALE_SEPARATE_BIT) { + if (mask != IIO_CHAN_INFO_SCALE) { dev_err(chip->dev, "light: mask value 0x%08lx not supported\n", mask); @@ -349,14 +349,14 @@ static int isl29028_read_raw(struct iio_dev *indio_dev, ret = IIO_VAL_INT; break; - case IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT: + case IIO_CHAN_INFO_SAMP_FREQ: if (chan->type != IIO_PROXIMITY) break; *val = chip->prox_sampling; ret = IIO_VAL_INT; break; - case IIO_CHAN_INFO_SCALE_SEPARATE_BIT: + case IIO_CHAN_INFO_SCALE: if (chan->type != IIO_LIGHT) break; *val = chip->lux_scale;