diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2007-02-08 17:25:09 -0500 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2007-02-20 03:38:45 -0500 |
commit | 28ee086d5b36aab2931f6740e409bb0fb6c65e5f (patch) | |
tree | 0a308c80affcc39c2c869f29f1109e5ee9d6140f /arch/powerpc/kernel/traps.c | |
parent | a8db3c1948eb30cd6988b5b96b654f591e6280b1 (diff) |
backlight: Fix external uses of backlight internal semaphore
backlight_device->sem has a very specific use as documented in the
header file. The external users of this are using it for a different
reason, to serialise access to the update_status() method.
backlight users were supposed to implement their own internal
serialisation of update_status() if needed but everyone is doing
things differently and incorrectly. Therefore add a global mutex to
take care of serialisation for everyone, once and for all.
Locking for get_brightness remains optional since most users don't
need it.
Also update the lcd class in a similar way.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
-rw-r--r-- | arch/powerpc/kernel/traps.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index dcc6f159fd94..35ce07b6a5bc 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -107,12 +107,10 @@ int die(const char *str, struct pt_regs *regs, long err) | |||
107 | if (machine_is(powermac) && pmac_backlight) { | 107 | if (machine_is(powermac) && pmac_backlight) { |
108 | struct backlight_properties *props; | 108 | struct backlight_properties *props; |
109 | 109 | ||
110 | down(&pmac_backlight->sem); | ||
111 | props = pmac_backlight->props; | 110 | props = pmac_backlight->props; |
112 | props->brightness = props->max_brightness; | 111 | props->brightness = props->max_brightness; |
113 | props->power = FB_BLANK_UNBLANK; | 112 | props->power = FB_BLANK_UNBLANK; |
114 | props->update_status(pmac_backlight); | 113 | backlight_update_status(pmac_backlight); |
115 | up(&pmac_backlight->sem); | ||
116 | } | 114 | } |
117 | mutex_unlock(&pmac_backlight_mutex); | 115 | mutex_unlock(&pmac_backlight_mutex); |
118 | #endif | 116 | #endif |