[PATCH] drivers/input/misc/wistron_btns.c NULL noise removal

[powerpc.git] / drivers / input / misc / wistron_btns.c

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 3df3013..bac3085 100644 (file)
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -320,7 +320,7 @@ static struct dmi_system_id dmi_ids[] = {
                },
                .driver_data = keymap_acer_aspire_1500
        },
-       { 0, }
+       { NULL, }
 };
 
 static int __init select_keymap(void)
@@ -451,6 +451,12 @@ static int wistron_suspend(struct platform_device *dev, pm_message_t state)
 {
        del_timer_sync(&poll_timer);
 
+       if (have_wifi)
+               bios_set_state(WIFI, 0);
+
+       if (have_bluetooth)
+               bios_set_state(BLUETOOTH, 0);
+
        return 0;
 }