[PATCH 0/4] WMI patches for 2.6.29-rc5

[PATCH 0/4] WMI patches for 2.6.29-rc5

[Carlos Corbacho]

Len,

The following are a set of trivial patches for 2.6.29-rc5 for ACPI-WMI and
acer-wmi. The last patch in this series you may already have picked up,
but is reposted here for completeness sake.

-Carlos
---

Carlos Corbacho (2):
      acer-wmi: Unmark as 'experimental'
      ACPI: WMI: Unmark as 'experimental'

Dan Carpenter (1):
      acer-wmi: double free in acer_rfkill_exit()

Robert Jarzmik (1):
      acer-wmi: Fix acpi video detection


 drivers/platform/x86/Kconfig    |    6 ++----
 drivers/platform/x86/acer-wmi.c |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

[PATCH 1/4] acer-wmi: double free in acer_rfkill_exit()

[Carlos Corbacho]

From: Dan Carpenter <error27@gmail.com>

This is acer_rfkill_exit() from drivers/platform/x86/acer-wmi.c.

The code frees wireless_rfkill->data again instead of
bluetooth_rfkill->data.

This was found using a code checker (http://repo.or.cz/w/smatch.git/).
Compile tested only, sorry.

regards,
dan carpenter

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>

--- orig/drivers/platform/x86/acer-wmi.c	2009-02-03 08:06:54.000000000 +0300
+++ devel/drivers/platform/x86/acer-wmi.c	2009-02-03 08:07:16.000000000 +0300
@@ -1026,7 +1026,7 @@
  	kfree(wireless_rfkill->data);
  	rfkill_unregister(wireless_rfkill);
  	if (has_cap(ACER_CAP_BLUETOOTH)) {
-		kfree(wireless_rfkill->data);
+		kfree(bluetooth_rfkill->data);
  		rfkill_unregister(bluetooth_rfkill);
  	}
  	return;
---

 0 files changed, 0 insertions(+), 0 deletions(-)

[PATCH 2/4] ACPI: WMI: Unmark as 'experimental'

[Carlos Corbacho]

ACPI-WMI isn't experimental anymore, and there are other drivers that now
depend on it that aren't either.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

 drivers/platform/x86/Kconfig |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9436311..7192f0a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -313,9 +313,8 @@ config EEEPC_LAPTOP
 
 
 config ACPI_WMI
-	tristate "WMI (EXPERIMENTAL)"
+	tristate "WMI"
 	depends on ACPI
-	depends on EXPERIMENTAL
 	help
 	  This driver adds support for the ACPI-WMI (Windows Management
 	  Instrumentation) mapper device (PNP0C14) found on some systems.

[PATCH 3/4] acer-wmi: Unmark as 'experimental'

[Carlos Corbacho]

This driver has been around and used long enough that we can drop the
'experimental'.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

 drivers/platform/x86/Kconfig |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7192f0a..92a529c 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -15,8 +15,7 @@ menuconfig X86_PLATFORM_DEVICES
 if X86_PLATFORM_DEVICES
 
 config ACER_WMI
-	tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	tristate "Acer WMI Laptop Extras"
 	depends on ACPI
 	depends on LEDS_CLASS
 	depends on NEW_LEDS

[PATCH 4/4] acer-wmi: Fix acpi video detection

[Carlos Corbacho]

From: Robert Jarzmik <rjarzmik@free.fr>

Acer WMI video driver can be used if _no_ acpi video
driver is found, not the opposite.

Signed-off-by: Robert Jarzmik <rjarzmik@free.fr>
Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

 drivers/platform/x86/acer-wmi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 94c9f91..6bcca61 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1297,7 +1297,7 @@ static int __init acer_wmi_init(void)
 
 	set_quirks();
 
-	if (!acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
+	if (acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
 		interface->capability &= ~ACER_CAP_BRIGHTNESS;
 		printk(ACER_INFO "Brightness must be controlled by "
 		       "generic video driver\n");

Re: [PATCH 0/4] WMI patches for 2.6.29-rc5

[Len Brown]

> The following are a set of trivial patches for 2.6.29-rc5 for ACPI-WMI and
> acer-wmi. The last patch in this series you may already have picked up,
> but is reposted here for completeness sake.
> 
> -Carlos
> ---
> 
> Carlos Corbacho (2):
>       acer-wmi: Unmark as 'experimental'
>       ACPI: WMI: Unmark as 'experimental'
> 
> Dan Carpenter (1):
>       acer-wmi: double free in acer_rfkill_exit()
> 
> Robert Jarzmik (1):
>       acer-wmi: Fix acpi video detection
> 
> 
>  drivers/platform/x86/Kconfig    |    6 ++----
>  drivers/platform/x86/acer-wmi.c |    2 +-
>  2 files changed, 3 insertions(+), 5 deletions(-)

1-4 applied.

thanks,
Len Brown, Intel Open Source Technology Center