]> Pileus Git - ~andy/linux/commitdiff
apple-gmux: Fix up the suspend/resume patch
authorMatthew Garrett <mjg@redhat.com>
Fri, 1 Jun 2012 19:18:52 +0000 (15:18 -0400)
committerMatthew Garrett <mjg@redhat.com>
Fri, 1 Jun 2012 19:18:52 +0000 (15:18 -0400)
I incorporated the wrong version of the suspend/resume patch for gmux,
and so lost David Woodhouse's fix to leave the backlight level unchanged
over suspend/resume. This fixes it up to v2.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
drivers/platform/x86/apple-gmux.c

index 6dcef4f199bb5900b5659b257f37c9647c1d8ad9..694a15a56230668c4eee12c7f5e7bc421a09cb0a 100644 (file)
@@ -88,7 +88,7 @@ static int gmux_update_status(struct backlight_device *bd)
        u32 brightness = bd->props.brightness;
 
        if (bd->props.state & BL_CORE_SUSPENDED)
-               brightness = 0;
+               return 0;
 
        /*
         * Older gmux versions require writing out lower bytes first then