[patch 13/13] sony_acpi: fix sony_acpi backlight registration and unregistration

[patch 13/13] sony_acpi: fix sony_acpi backlight registration and unregistration

[akpm]

From: Mattia Dongili <malattia@linux.it>

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: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/acpi/sony_acpi.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff -puN drivers/acpi/sony_acpi.c~sony_acpi-fix-sony_acpi-backlight-registration-and-unregistration drivers/acpi/sony_acpi.c
--- a/drivers/acpi/sony_acpi.c~sony_acpi-fix-sony_acpi-backlight-registration-and-unregistration
+++ a/drivers/acpi/sony_acpi.c
@@ -354,9 +354,14 @@ static int sony_acpi_add(struct acpi_dev
 	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_dev
 	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));
_

Re: [patch 13/13] sony_acpi: fix sony_acpi backlight registration and unregistration

[Len Brown]

NAK, included in sony-laptop series.

AFAICT, Mattia applied all the various sony fixes floating about to sony_acpi.c
before re-naming it to sony-laptop.c, where it lives in the acpi-test tree today.

thanks,
-Len

On Monday 05 February 2007 19:09, akpm@linux-foundation.org wrote:
> From: Mattia Dongili <malattia@linux.it>
> 
> 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: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/acpi/sony_acpi.c |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff -puN drivers/acpi/sony_acpi.c~sony_acpi-fix-sony_acpi-backlight-registration-and-unregistration drivers/acpi/sony_acpi.c
> --- a/drivers/acpi/sony_acpi.c~sony_acpi-fix-sony_acpi-backlight-registration-and-unregistration
> +++ a/drivers/acpi/sony_acpi.c
> @@ -354,9 +354,14 @@ static int sony_acpi_add(struct acpi_dev
>  	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_dev
>  	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));
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>