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: (179 commits)
  ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
  acpi: fix section mismatch warning in pnpacpi
  intel_menlo: fix build warning
  ACPI: Cleanup: Remove unneeded, multiple local dummy variables
  ACPI: video - fix permissions on some proc entries
  ACPI: video - properly handle errors when registering proc elements
  ACPI: video - do not store invalid entries in attached_array list
  ACPI: re-name acpi_pm_ops to acpi_suspend_ops
  ACER_WMI/ASUS_LAPTOP: fix build bug
  thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
  ACPI: check a return value correctly in acpi_power_get_context()
  #if 0 acpi/bay.c:eject_removable_drive()
  eeepc-laptop: add hwmon fan control
  eeepc-laptop: add backlight
  eeepc-laptop: add base driver
  ACPI: thinkpad-acpi: bump up version to 0.20
  ACPI: thinkpad-acpi: fix selects in Kconfig
  ACPI: thinkpad-acpi: use a private workqueue
  ACPI: thinkpad-acpi: fluff really minor fix
  ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
  ...

Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.

1 files changed, 39 insertions, 7 deletions

diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 7d366ca672d3..20771b7d4482 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -106,18 +106,53 @@ static void pnp_release_device(struct device *dmdev)
         pnp_free_option(dev->independent);
         pnp_free_option(dev->dependent);
         pnp_free_ids(dev);
+        kfree(dev->res);
         kfree(dev);
 }
 
-int __pnp_add_device(struct pnp_dev *dev)
+struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid)
 {
-        int ret;
+        struct pnp_dev *dev;
+        struct pnp_id *dev_id;
 
-        pnp_fixup_device(dev);
+        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        dev->res = kzalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
+        if (!dev->res) {
+                kfree(dev);
+                return NULL;
+        }
+
+        dev->protocol = protocol;
+        dev->number = id;
+        dev->dma_mask = DMA_24BIT_MASK;
+
+        dev->dev.parent = &dev->protocol->dev;
         dev->dev.bus = &pnp_bus_type;
         dev->dev.dma_mask = &dev->dma_mask;
-        dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
+        dev->dev.coherent_dma_mask = dev->dma_mask;
         dev->dev.release = &pnp_release_device;
+
+        sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
+                dev->number);
+
+        dev_id = pnp_add_id(dev, pnpid);
+        if (!dev_id) {
+                kfree(dev->res);
+                kfree(dev);
+                return NULL;
+        }
+
+        return dev;
+}
+
+int __pnp_add_device(struct pnp_dev *dev)
+{
+        int ret;
+
+        pnp_fixup_device(dev);
         dev->status = PNP_READY;
         spin_lock(&pnp_lock);
         list_add_tail(&dev->global_list, &pnp_global);
@@ -145,9 +180,6 @@ int pnp_add_device(struct pnp_dev *dev)
         if (dev->card)
                 return -EINVAL;
 
-        dev->dev.parent = &dev->protocol->dev;
-        sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
-                dev->number);
         ret = __pnp_add_device(dev);
         if (ret)
                 return ret;