The patch titled backlight: do not power off backlight when unregistering has been added to the -mm tree. Its filename is backlight-do-not-power-off-backlight-when-unregistering-try-3.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: backlight: do not power off backlight when unregistering From: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx> ACPI drivers like ibm-acpi are moving to the backlight sysfs infrastructure. During ibm-acpi testing, I have noticed that backlight_device_unregister() sets the display brightness and power to zero. This causes the display to be dimmed on ibm-acpi module removal. It will affect all other ACPI drivers that are being converted to use the backlight class, as well. It also affects a number of framebuffer devices that are used on desktops and laptops which might also not want such behaviour. Since working around this behaviour requires undesireable hacks, Richard Purdie decided that we would be better off reverting the changes in the sysfs class, and adding the code to dim and power off the backlight device to the drivers that want it. This patch is my attempt to do so. Patch against latest linux-2.6.git. Changes untested, as I lack the required hardware. Still, they are trivial enough that, apart from typos, there is little chance of getting them wrong. Signed-off-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx> Acked-by: Richard Purdie <rpurdie@xxxxxxxxx> Acked-by: Pavel Machek <pavel@xxxxxx> Cc: James Simmons <jsimmons@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/video/backlight/backlight.c | 6 ------ drivers/video/backlight/corgi_bl.c | 4 ++++ drivers/video/backlight/hp680_bl.c | 4 ++++ drivers/video/backlight/locomolcd.c | 4 ++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff -puN drivers/video/backlight/backlight.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 drivers/video/backlight/backlight.c --- a/drivers/video/backlight/backlight.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 +++ a/drivers/video/backlight/backlight.c @@ -285,12 +285,6 @@ void backlight_device_unregister(struct &bl_class_device_attributes[i]); down(&bd->sem); - if (likely(bd->props && bd->props->update_status)) { - bd->props->brightness = 0; - bd->props->power = 0; - bd->props->update_status(bd); - } - bd->props = NULL; up(&bd->sem); diff -puN drivers/video/backlight/corgi_bl.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 drivers/video/backlight/corgi_bl.c --- a/drivers/video/backlight/corgi_bl.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 +++ a/drivers/video/backlight/corgi_bl.c @@ -135,6 +135,10 @@ static int corgibl_probe(struct platform static int corgibl_remove(struct platform_device *dev) { + corgibl_data.power = 0; + corgibl_data.brightness = 0; + corgibl_send_intensity(corgi_backlight_device); + backlight_device_unregister(corgi_backlight_device); printk("Corgi Backlight Driver Unloaded\n"); diff -puN drivers/video/backlight/hp680_bl.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 drivers/video/backlight/hp680_bl.c --- a/drivers/video/backlight/hp680_bl.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 +++ a/drivers/video/backlight/hp680_bl.c @@ -117,6 +117,10 @@ static int __init hp680bl_probe(struct p static int hp680bl_remove(struct platform_device *dev) { + hp680bl_data.brightness = 0; + hp680bl_data.power = 0; + hp680bl_send_intensity(hp680_backlight_device); + backlight_device_unregister(hp680_backlight_device); return 0; diff -puN drivers/video/backlight/locomolcd.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 drivers/video/backlight/locomolcd.c --- a/drivers/video/backlight/locomolcd.c~backlight-do-not-power-off-backlight-when-unregistering-try-3 +++ a/drivers/video/backlight/locomolcd.c @@ -200,6 +200,10 @@ static int locomolcd_remove(struct locom { unsigned long flags; + locomobl_data.brightness = 0; + locomobl_data.power = 0; + locomolcd_set_intensity(locomolcd_bl_device); + backlight_device_unregister(locomolcd_bl_device); local_irq_save(flags); locomolcd_dev = NULL; _ Patches currently in -mm which might be from hmh@xxxxxxxxxx are git-acpi.patch backlight-do-not-power-off-backlight-when-unregistering-try-3.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html