Merge tag 'v3.3-rc7' into x86/platform

Merge reason: Update to the almost-final v3.3 kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index 45e6878d7374..e59c166a0ce2 100644
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -164,8 +164,8 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
 
         if (drvdata->mode == LM3530_BL_MODE_ALS) {
                 if (pltfm->als_vmax == 0) {
-                        pltfm->als_vmin = als_vmin = 0;
-                        pltfm->als_vmin = als_vmax = LM3530_ALS_WINDOW_mV;
+                        pltfm->als_vmin = 0;
+                        pltfm->als_vmax = LM3530_ALS_WINDOW_mV;
                 }
 
                 als_vmin = pltfm->als_vmin;