Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/acpi/video.c
index 5259d502add6a76405cd1c2401b222c6157b8761,ae427100a1efd4544f0d3ee881ffcb1547f0e2bc..100c8eeaa5dd9eea15f92dd142a5167f4fe1c1be
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -374,14 -385,14 +388,15 @@@ static int video_get_cur_state(struct t
        struct acpi_device *device = cdev->devdata;
        struct acpi_video_device *video = acpi_driver_data(device);
        unsigned long long level;
 -      int state;
 +      int offset;
  
-       acpi_video_device_lcd_get_level_current(video, &level);
+       if (acpi_video_device_lcd_get_level_current(video, &level))
+               return -EINVAL;
 -      for (state = 2; state < video->brightness->count; state++)
 -              if (level == video->brightness->levels[state])
 -                      return sprintf(buf, "%d\n",
 -                                     video->brightness->count - state - 1);
 +      for (offset = 2; offset < video->brightness->count; offset++)
 +              if (level == video->brightness->levels[offset]) {
 +                      *state = video->brightness->count - offset - 1;
 +                      return 0;
 +              }
  
        return -EINVAL;
  }