Merge branch 'master' into for-next

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

7 files changed, 42 insertions, 14 deletions

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 3ec24609151e..734c650a47c4 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -502,8 +502,10 @@ static ssize_t adp8860_bl_l1_daylight_max_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct adp8860_bl *data = dev_get_drvdata(dev);
+        int ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        if (ret)
+                return ret;
 
-        strict_strtoul(buf, 10, &data->cached_daylight_max);
         return adp8860_store(dev, buf, count, ADP8860_BLMX1);
 }
 static DEVICE_ATTR(l1_daylight_max, 0664, adp8860_bl_l1_daylight_max_show,
@@ -614,7 +616,7 @@ static ssize_t adp8860_bl_ambient_light_zone_store(struct device *dev,
         if (val == 0) {
                 /* Enable automatic ambient light sensing */
                 adp8860_set_bits(data->client, ADP8860_MDCR, CMP_AUTOEN);
-        } else if ((val > 0) && (val < 6)) {
+        } else if ((val > 0) && (val <= 3)) {
                 /* Disable automatic ambient light sensing */
                 adp8860_clr_bits(data->client, ADP8860_MDCR, CMP_AUTOEN);
 
@@ -622,7 +624,7 @@ static ssize_t adp8860_bl_ambient_light_zone_store(struct device *dev,
                 mutex_lock(&data->lock);
                 adp8860_read(data->client, ADP8860_CFGR, &reg_val);
                 reg_val &= ~(CFGR_BLV_MASK << CFGR_BLV_SHIFT);
-                reg_val |= val << CFGR_BLV_SHIFT;
+                reg_val |= (val - 1) << CFGR_BLV_SHIFT;
                 adp8860_write(data->client, ADP8860_CFGR, reg_val);
                 mutex_unlock(&data->lock);
         }
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index e207810bba3c..08703299ef61 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -197,12 +197,12 @@ static int backlight_suspend(struct device *dev, pm_message_t state)
 {
         struct backlight_device *bd = to_backlight_device(dev);
 
-        if (bd->ops->options & BL_CORE_SUSPENDRESUME) {
-                mutex_lock(&bd->ops_lock);
+        mutex_lock(&bd->ops_lock);
+        if (bd->ops && bd->ops->options & BL_CORE_SUSPENDRESUME) {
                 bd->props.state |= BL_CORE_SUSPENDED;
                 backlight_update_status(bd);
-                mutex_unlock(&bd->ops_lock);
         }
+        mutex_unlock(&bd->ops_lock);
 
         return 0;
 }
@@ -211,12 +211,12 @@ static int backlight_resume(struct device *dev)
 {
         struct backlight_device *bd = to_backlight_device(dev);
 
-        if (bd->ops->options & BL_CORE_SUSPENDRESUME) {
-                mutex_lock(&bd->ops_lock);
+        mutex_lock(&bd->ops_lock);
+        if (bd->ops && bd->ops->options & BL_CORE_SUSPENDRESUME) {
                 bd->props.state &= ~BL_CORE_SUSPENDED;
                 backlight_update_status(bd);
-                mutex_unlock(&bd->ops_lock);
         }
+        mutex_unlock(&bd->ops_lock);
 
         return 0;
 }
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 9093ef0fa869..c67801e57aaf 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -78,7 +78,7 @@ static int l4f00242t03_lcd_power_set(struct lcd_device *ld, int power)
         const u16 slpin = 0x10;
         const u16 disoff = 0x28;
 
-        if (power) {
+        if (power <= FB_BLANK_NORMAL) {
                 if (priv->lcd_on)
                         return 0;
 
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index abc43a0eb97d..5d3cf33953ac 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -129,7 +129,7 @@ static int lms283gf05_power_set(struct lcd_device *ld, int power)
         struct spi_device *spi = st->spi;
         struct lms283gf05_pdata *pdata = spi->dev.platform_data;
 
-        if (power) {
+        if (power <= FB_BLANK_NORMAL) {
                 if (pdata)
                         lms283gf05_reset(pdata->reset_gpio,
                                         pdata->reset_inverted);
diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
index 9fb533f6373e..1485f7345f49 100644
--- a/drivers/video/backlight/mbp_nvidia_bl.c
+++ b/drivers/video/backlight/mbp_nvidia_bl.c
@@ -335,6 +335,24 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
                 },
                 .driver_data    = (void *)&nvidia_chipset_data,
         },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBookAir 3,1",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1"),
+                },
+                .driver_data    = (void *)&nvidia_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBookAir 3,2",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2"),
+                },
+                .driver_data    = (void *)&nvidia_chipset_data,
+        },
         { }
 };
 
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 550443518891..21866ec69656 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -25,6 +25,7 @@ struct pwm_bl_data {
         struct pwm_device       *pwm;
         struct device           *dev;
         unsigned int            period;
+        unsigned int            lth_brightness;
         int                     (*notify)(struct device *,
                                           int brightness);
 };
@@ -48,7 +49,9 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
                 pwm_config(pb->pwm, 0, pb->period);
                 pwm_disable(pb->pwm);
         } else {
-                pwm_config(pb->pwm, brightness * pb->period / max, pb->period);
+                brightness = pb->lth_brightness +
+                        (brightness * (pb->period - pb->lth_brightness) / max);
+                pwm_config(pb->pwm, brightness, pb->period);
                 pwm_enable(pb->pwm);
         }
         return 0;
@@ -92,6 +95,8 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
         pb->period = data->pwm_period_ns;
         pb->notify = data->notify;
+        pb->lth_brightness = data->lth_brightness *
+                (data->pwm_period_ns / data->max_brightness);
         pb->dev = &pdev->dev;
 
         pb->pwm = pwm_request(data->pwm_id, "backlight");
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index a3128c9cb7ad..5927db0da999 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -729,10 +729,10 @@ static ssize_t s6e63m0_sysfs_show_gamma_table(struct device *dev,
 
         return strlen(buf);
 }
-static DEVICE_ATTR(gamma_table, 0644,
+static DEVICE_ATTR(gamma_table, 0444,
                 s6e63m0_sysfs_show_gamma_table, NULL);
 
-static int __init s6e63m0_probe(struct spi_device *spi)
+static int __devinit s6e63m0_probe(struct spi_device *spi)
 {
         int ret = 0;
         struct s6e63m0 *lcd = NULL;
@@ -829,6 +829,9 @@ static int __devexit s6e63m0_remove(struct spi_device *spi)
         struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev);
 
         s6e63m0_power(lcd, FB_BLANK_POWERDOWN);
+        device_remove_file(&spi->dev, &dev_attr_gamma_table);
+        device_remove_file(&spi->dev, &dev_attr_gamma_mode);
+        backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
         kfree(lcd);