Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc...
Len Brown [Sat, 7 Feb 2009 06:34:56 +0000 (01:34 -0500)]
1  2  3  4  5  6  7  8 
drivers/acpi/Kconfig
drivers/acpi/dock.c
drivers/acpi/osl.c
drivers/acpi/sleep.c
drivers/acpi/video.c
drivers/platform/x86/eeepc-laptop.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@@@@@@@ -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;