diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 15:59:04 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 15:59:04 (GMT) |
| commit | e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b (patch) | |
| tree | 389fbdf161a3c28c9b2f98fdc1ccd89d474ef884 /drivers/staging/iio/light/isl29018.c | |
| parent | 3ffdea3feca9e2c95c2e93e217d77c9c368f747a (diff) | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
| download | linux-e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b.tar.xz | |
Merge 3.12-rc2 into staging-next.
This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/light/isl29018.c')
| -rw-r--r-- | drivers/staging/iio/light/isl29018.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c index e314d7e..488e690 100644 --- a/drivers/staging/iio/light/isl29018.c +++ b/drivers/staging/iio/light/isl29018.c @@ -563,6 +563,7 @@ static int isl29018_probe(struct i2c_client *client, mutex_init(&chip->lock); chip->lux_scale = 1; + chip->lux_uscale = 0; chip->range = 1000; chip->adc_bit = 16; chip->suspended = false; |