diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-11-27 12:21:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-11-27 12:21:20 -0800 |
| commit | 940b28397b14f433b1bc745bc0f74b23ee7bd878 (patch) | |
| tree | cd039ec79f0257d4e39a73ae103dd5c752cca365 | |
| parent | c21e5802a887410ecc60af05d467d5b8177da757 (diff) | |
| download | patches-940b28397b14f433b1bc745bc0f74b23ee7bd878.tar.gz | |
version resync
| -rw-r--r-- | driver-class/pcmcia-device.patch | 2 | ||||
| -rw-r--r-- | driver/debugfs-add-header-file.patch | 30 | ||||
| -rw-r--r-- | driver/driver-core-fix-device_attribute-memory-leak-in-device_del.patch | 33 | ||||
| -rw-r--r-- | series | 3 | ||||
| -rw-r--r-- | usb/usb-ati-remote-memleak-fix.patch | 41 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 2 insertions, 109 deletions
diff --git a/driver-class/pcmcia-device.patch b/driver-class/pcmcia-device.patch index a1b76964dd5315..0765488fb07b3a 100644 --- a/driver-class/pcmcia-device.patch +++ b/driver-class/pcmcia-device.patch @@ -197,7 +197,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!socket) return; -@@ -1283,8 +1283,8 @@ static void pcmcia_bus_remove_socket(str +@@ -1285,8 +1285,8 @@ static void pcmcia_bus_remove_socket(str /* the pcmcia_bus_interface is used to handle pcmcia socket devices */ static struct class_interface pcmcia_bus_interface = { .class = &pcmcia_socket_class, diff --git a/driver/debugfs-add-header-file.patch b/driver/debugfs-add-header-file.patch deleted file mode 100644 index d73acb57fd2ea8..00000000000000 --- a/driver/debugfs-add-header-file.patch +++ /dev/null @@ -1,30 +0,0 @@ -From randy.dunlap@oracle.com Thu Nov 16 21:41:29 2006 -Date: Thu, 16 Nov 2006 21:34:00 -0800 -From: Randy Dunlap <randy.dunlap@oracle.com> -Cc: gregkh <greg@kroah.com> -Subject: debugfs: add header file -Message-Id: <20061116213400.a554f40c.randy.dunlap@oracle.com> -Mime-Version: 1.0 -Content-Type: text/plain; charset=US-ASCII - -From: Randy Dunlap <randy.dunlap@oracle.com> - -debugfs needs include/linux/kobject.h for <kernel_subsys>. - -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - fs/debugfs/inode.c | 1 + - 1 file changed, 1 insertion(+) - ---- gregkh-2.6.orig/fs/debugfs/inode.c -+++ gregkh-2.6/fs/debugfs/inode.c -@@ -21,6 +21,7 @@ - #include <linux/mount.h> - #include <linux/pagemap.h> - #include <linux/init.h> -+#include <linux/kobject.h> - #include <linux/namei.h> - #include <linux/debugfs.h> - diff --git a/driver/driver-core-fix-device_attribute-memory-leak-in-device_del.patch b/driver/driver-core-fix-device_attribute-memory-leak-in-device_del.patch deleted file mode 100644 index 5f8f8129242377..00000000000000 --- a/driver/driver-core-fix-device_attribute-memory-leak-in-device_del.patch +++ /dev/null @@ -1,33 +0,0 @@ -From catalin.marinas@gmail.com Sat Nov 18 14:43:14 2006 -From: Catalin Marinas <catalin.marinas@gmail.com> -Subject: Driver core: Fix device_attribute memory leak in device_del -Cc: Greg Kroah-Hartman <gregkh@suse.de> -Date: Sat, 18 Nov 2006 22:42:45 +0000 -Message-ID: <20061118224011.6975.7433.stgit@localhost.localdomain> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" - -dev->devt_attr is allocated in device_add() but it is never freed in -device_del() in the drivers/base/core.c file (reported by kmemleak). - -Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/core.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/base/core.c -+++ gregkh-2.6/drivers/base/core.c -@@ -591,8 +591,10 @@ void device_del(struct device * dev) - - if (parent) - klist_del(&dev->knode_parent); -- if (dev->devt_attr) -+ if (dev->devt_attr) { - device_remove_file(dev, dev->devt_attr); -+ kfree(dev->devt_attr); -+ } - if (dev->class) { - sysfs_remove_link(&dev->kobj, "subsystem"); - sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id); @@ -5,7 +5,6 @@ gregkh/sysfs-test.patch gregkh/ata_piix-multithread.patch # driver patches queued for 2.6.19 -driver/driver-core-fix-device_attribute-memory-leak-in-device_del.patch # driver patches for after 2.6.19 is out driver/driver-core-add-notification-of-bus-events.patch @@ -44,7 +43,6 @@ driver/driver-core-call-platform_notify_remove-later.patch driver/cpu-topology-consider-sysfs_create_group-return-value.patch driver/sysfs-sysfs_write_file-writes-zero-terminated-data.patch driver/driver-core-introduce-device_find_child.patch -driver/debugfs-add-header-file.patch driver/driver-core-make-drivers-base-core.c-setup_parent-static.patch driver/driver-core-introduce-device_move-move-a-device-to-a-new-parent.patch driver/driver-core-use-klist_remove-in-device_move.patch @@ -102,7 +100,6 @@ pci/pci-make-arch-i386-pci-common.c-pci_bf_sort-static.patch # usb patches queued for 2.6.19 (bugfixes, new ids, etc.) # stuff after 2.6.19 is out -usb/usb-ati-remote-memleak-fix.patch usb/usb-takes-31-devices-per-hub.patch usb/usb-hub-root-hub-code-takes-more-than-15-devices.patch usb/usb-hid-handle-stall-on-interrupt-endpoint.patch diff --git a/usb/usb-ati-remote-memleak-fix.patch b/usb/usb-ati-remote-memleak-fix.patch deleted file mode 100644 index 93d62dce9c04ea..00000000000000 --- a/usb/usb-ati-remote-memleak-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From m.kozlowski@tuxland.pl Thu Nov 16 08:15:22 2006 -From: Mariusz Kozlowski <m.kozlowski@tuxland.pl> -To: Torrey Hoffman <thoffman@arnor.net>, Greg KH <greg@kroah.com>, linux-usb-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org -Subject: USB: ati remote memleak fix -Date: Thu, 16 Nov 2006 16:50:25 +0100 -Message-Id: <200611161650.26989.m.kozlowski@tuxland.pl> - -This is a bug. When checking for ati_remote->outbuf we free -freeing ati_remote->inbuf so we end up freeing ati_remote->inbuf twice. -Also the checks for 'ati_remote->inbuf != NULL' and -'ati_remote->outbuf != NULL' are redundant as usb_buffer_free() does -this. - -Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/input/ati_remote.c | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/input/ati_remote.c -+++ gregkh-2.6/drivers/usb/input/ati_remote.c -@@ -636,13 +636,11 @@ static void ati_remote_free_buffers(stru - if (ati_remote->out_urb) - usb_free_urb(ati_remote->out_urb); - -- if (ati_remote->inbuf) -- usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, -- ati_remote->inbuf, ati_remote->inbuf_dma); -- -- if (ati_remote->outbuf) -- usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, -- ati_remote->inbuf, ati_remote->outbuf_dma); -+ usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, -+ ati_remote->inbuf, ati_remote->inbuf_dma); -+ -+ usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, -+ ati_remote->outbuf, ati_remote->outbuf_dma); - } - - static void ati_remote_input_init(struct ati_remote *ati_remote) @@ -1 +1 @@ -2.6.19-rc6-git8 +2.6.19-rc6-git11 |