From: Len Brown <len.brown@intel.com>
Date: Sat, 7 Feb 2009 06:34:56 +0000 (-0500)
Subject: Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2d29c6a075787f2c1bc49b86a084d2b878f72fc4;p=linux-2.6-omap-h63xx.git

Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
---

2d29c6a075787f2c1bc49b86a084d2b878f72fc4
diff --cc drivers/platform/x86/eeepc-laptop.c
index 4348d9909bb,9d93cb971e5,9d93cb971e5,9d93cb971e5,9d93cb971e5,8fb983f5629,9d93cb971e5,9d93cb971e5..786ed8661cb
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@@@@@@@@ -515,44 -510,9 -510,9 -510,9 -510,9 -510,10 -510,9 -510,9 +515,45 @@@@@@@@@ static int eeepc_hotk_check(void
        static void notify_brn(void)
        {
        	struct backlight_device *bd = eeepc_backlight_device;
----- --	bd->props.brightness = read_brightness(bd);
+++++ ++	if (bd)
+++++ ++		bd->props.brightness = read_brightness(bd);
 ++++ ++}
 ++++ ++
 +++++++static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
 +++++++{
 +++++++	struct pci_dev *dev;
 +++++++	struct pci_bus *bus = pci_find_bus(0, 1);
 +++++++
 +++++++	if (event != ACPI_NOTIFY_BUS_CHECK)
 +++++++		return;
 +++++++
 +++++++	if (!bus) {
 +++++++		printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
 +++++++		return;
 +++++++	}
 +++++++
 +++++++	if (get_acpi(CM_ASL_WLAN) == 1) {
 +++++++		dev = pci_get_slot(bus, 0);
 +++++++		if (dev) {
 +++++++			/* Device already present */
 +++++++			pci_dev_put(dev);
 +++++++			return;
 +++++++		}
 +++++++		dev = pci_scan_single_device(bus, 0);
 +++++++		if (dev) {
 +++++++			pci_bus_assign_resources(bus);
 +++++++			if (pci_bus_add_device(dev))
 +++++++				printk(EEEPC_ERR "Unable to hotplug wifi\n");
 +++++++		}
 +++++++	} else {
 +++++++		dev = pci_get_slot(bus, 0);
 +++++++		if (dev) {
 +++++++			pci_remove_bus_device(dev);
 +++++++			pci_dev_put(dev);
 +++++++		}
 +++++++	}
     +  }
     +  
        static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
        {
        	static struct key_entry *key;