From 7df03b82ed081777d2393ff8a5fb9d4a3a560f26 Mon Sep 17 00:00:00 2001
From: Mattia Dongili <malattia@linux.it>
Date: Sat, 13 Jan 2007 23:04:41 +0100
Subject: [PATCH] sony_acpi: Fix sony_acpi backlight registration and
unregistration
Initialize the current brightness if the driver registration
was successful and unregister the driver in the error exit path.
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/sony_acpi.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/acpi/sony_acpi.c b/drivers/acpi/sony_acpi.c
index c65f5893e0e2..c01d98db2fc1 100644
--- a/drivers/acpi/sony_acpi.c
+++ b/drivers/acpi/sony_acpi.c
@@ -354,9 +354,14 @@ static int sony_acpi_add(struct acpi_device *device)
if (ACPI_SUCCESS(acpi_get_handle(sony_acpi_handle, "GBRT", &handle))) {
sony_backlight_device = backlight_device_register("sony", NULL,
NULL, &sony_backlight_properties);
+
if (IS_ERR(sony_backlight_device)) {
printk(LOG_PFX "unable to register backlight device\n");
+ sony_backlight_device = NULL;
}
+ else
+ sony_backlight_properties.brightness =
+ sony_backlight_get_brightness(sony_backlight_device);
}
for (item = sony_acpi_values; item->name; ++item) {
@@ -400,6 +405,9 @@ static int sony_acpi_add(struct acpi_device *device)
return 0;
outproc:
+ if (sony_backlight_device)
+ backlight_device_unregister(sony_backlight_device);
+
for (item = sony_acpi_values; item->name; ++item)
if (item->proc)
remove_proc_entry(item->name, acpi_device_dir(device));
--
GitLab