some patches added to the queue

diff --git a/queue-2.6.16/cs5535_gpio.c-call-cdev_del-during-module_exit-to-unmap-kobject-references-and-other-cleanups.patch b/queue-2.6.16/cs5535_gpio.c-call-cdev_del-during-module_exit-to-unmap-kobject-references-and-other-cleanups.patch
new file mode 100644 (file)
index 0000000..ecd33a0
--- /dev/null
+++ b/queue-2.6.16/cs5535_gpio.c-call-cdev_del-during-module_exit-to-unmap-kobject-references-and-other-cleanups.patch
@@ -0,0 +1,43 @@
+From git-commits-head-owner@vger.kernel.org Thu Apr 20 09:02:58 2006
+Date: Thu, 20 Apr 2006 16:00:56 GMT
+Message-Id: <200604201600.k3KG0uk0002856@hera.kernel.org>
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+To: git-commits-head@vger.kernel.org
+Subject: [PATCH] cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+
+From: Thayumanavar Sachithanantham <thayumk@gmail.com>
+
+[PATCH] cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+
+During module unloading, cdev_del() must be called to unmap cdev related
+kobject references and other cleanups(such as inode->i_cdev being set to
+NULL) which prevents the OOPS upon subsequent loading, usage and unloading
+of modules(as seen in the mail thread
+http://marc.theaimsgroup.com/?l=linux-kernel&m=114533640609018&w=2).
+
+Also, remove unneeded test of gpio_base.
+
+Signed-off-by: Thayumanavar Sachithanantham <thayumk@gmail.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/cs5535_gpio.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- linux-2.6.16.11.orig/drivers/char/cs5535_gpio.c
++++ linux-2.6.16.11/drivers/char/cs5535_gpio.c
+@@ -241,9 +241,10 @@ static int __init cs5535_gpio_init(void)
+ static void __exit cs5535_gpio_cleanup(void)
+ {
+       dev_t dev_id = MKDEV(major, 0);
++
++      cdev_del(&cs5535_gpio_cdev);
+       unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
+-      if (gpio_base != 0)
+-              release_region(gpio_base, CS5535_GPIO_SIZE);
++      release_region(gpio_base, CS5535_GPIO_SIZE);
+ }
+ 
+ module_init(cs5535_gpio_init);

diff --git a/queue-2.6.16/series b/queue-2.6.16/series
new file mode 100644 (file)
index 0000000..536dd78
--- /dev/null
+++ b/queue-2.6.16/series
@@ -0,0 +1,2 @@
+sonypi-correct-detection-of-new-ich7-based-laptops.patch
+cs5535_gpio.c-call-cdev_del-during-module_exit-to-unmap-kobject-references-and-other-cleanups.patch

diff --git a/queue-2.6.16/sonypi-correct-detection-of-new-ich7-based-laptops.patch b/queue-2.6.16/sonypi-correct-detection-of-new-ich7-based-laptops.patch
new file mode 100644 (file)
index 0000000..7e52493
--- /dev/null
+++ b/queue-2.6.16/sonypi-correct-detection-of-new-ich7-based-laptops.patch
@@ -0,0 +1,36 @@
+From git-commits-head-owner@vger.kernel.org Thu Apr 20 09:02:58 2006
+Date: Thu, 20 Apr 2006 16:01:02 GMT
+Message-Id: <200604201601.k3KG1249002989@hera.kernel.org>
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+To: git-commits-head@vger.kernel.org
+Subject: [PATCH] sonypi: correct detection of new ICH7-based laptops
+
+From: Arnaud MAZIN <arnaud.mazin@gmail.com>
+
+[PATCH] sonypi: correct detection of new ICH7-based laptops
+
+Add a test to detect the ICH7 based Core Duo SONY laptops (such as the SZ1)
+as type3 models.
+
+Signed-off-by: Arnaud MAZIN < arnaud.mazin@gmail.com>
+Acked-by: Stelian Pop <stelian@poppies.net>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/sonypi.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- linux-2.6.16.11.orig/drivers/char/sonypi.c
++++ linux-2.6.16.11/drivers/char/sonypi.c
+@@ -1341,6 +1341,9 @@ static int __devinit sonypi_probe(struct
+       else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                         PCI_DEVICE_ID_INTEL_ICH6_1, NULL)))
+               sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3;
++      else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
++                                        PCI_DEVICE_ID_INTEL_ICH7_1, NULL)))
++              sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3;
+       else
+               sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE2;
+