Commit bd72f85b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI button: don't try to use a non-existent lid device
  ACPI: video: Loosen strictness of video bus detection code
  eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated
  eeepc-laptop: Properly annote eeepc_enable_camera().
  ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2)
  fujitsu-laptop: address missed led-class ifdef fixup
  ACPI: Kconfig, fix proc aggregator text
  ACPI: add AC/DC notifier
parents 13e356c9 d59733c1

drivers/acpi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -218,10 +218,10 @@ config ACPI_PROCESSOR_AGGREGATOR 
	depends on X86

	help

	  ACPI 4.0 defines processor Aggregator, which enables OS to perform

	  specfic processor configuration and control that applies to all

	  specific processor configuration and control that applies to all

	  processors in the platform. Currently only logical processor idling

	  is defined, which is to reduce power consumption. This driver

	  support the new device.

	  supports the new device.



config ACPI_THERMAL

	tristate "Thermal Zone"

drivers/acpi/ac.c

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) 
		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  dev_name(&device->dev), event,

						  (u32) ac->state);

		acpi_notifier_call_chain(device, event, (u32) ac->state);

#ifdef CONFIG_ACPI_SYSFS_POWER

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

#endif

drivers/acpi/button.c

+3 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ int acpi_lid_open(void) 
	acpi_status status;

	unsigned long long state;



	if (!lid_device)

		return -ENODEV;



	status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL,

				       &state);

	if (ACPI_FAILURE(status))

drivers/acpi/pci_root.c

+11 −0
Original line number Diff line number Diff line
@@ -389,6 +389,17 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle) 


		pbus = pdev->subordinate;

		pci_dev_put(pdev);



		/*

		 * This function may be called for a non-PCI device that has a

		 * PCI parent (eg. a disk under a PCI SATA controller).  In that

		 * case pdev->subordinate will be NULL for the parent.

		 */

		if (!pbus) {

			dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");

			pdev = NULL;

			break;

		}

	}

out:

	list_for_each_entry_safe(node, tmp, &device_list, node)

drivers/acpi/video.c

+6 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,12 @@ static int acpi_video_bus_check(struct acpi_video_bus *video) 
	 */



	/* Does this device support video switching? */

	if (video->cap._DOS) {

	if (video->cap._DOS || video->cap._DOD) {

		if (!video->cap._DOS) {

			printk(KERN_WARNING FW_BUG

				"ACPI(%s) defines _DOD but not _DOS\n",

				acpi_device_bid(video->device));

		}

		video->flags.multihead = 1;

		status = 0;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE