From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 1 Jun 2012 19:18:52 +0000 (-0400)
Subject: apple-gmux: Fix up the suspend/resume patch
X-Git-Tag: v3.5-rc1~9^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a2f01a899347fd97cb18094e5a55640cab552818;p=~emulex%2Finfiniband.git

apple-gmux: Fix up the suspend/resume patch

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>
---

diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 6dcef4f199b..694a15a5623 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -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