remove a usb patch that already went into the -stable tree.

diff --git a/review-2.6.22/series b/review-2.6.22/series
index 05e9b6f4065308128e5303df0e916861cc967b52..7918c3e4af9f081bdfbd832a7ec801e1402c9db8 100644 (file)
--- a/review-2.6.22/series
+++ b/review-2.6.22/series
@@ -22,7 +22,6 @@ pci-lets-kill-the-pci-hidden-behind-bridge-message.patch
 pci-disable-msi-on-rs690.patch
 pci-disable-msi-on-rd580.patch
 pci-disable-msi-on-rx790.patch
-usb-cdc-acm-fix-sysfs-attribute-registration-bug.patch
 usb-allow-retry-on-descriptor-fetch-errors.patch
 usb-fix-dos-in-pwc-usb-video-driver.patch
 usb-add-product-type-to-usb-interface-events.patch

diff --git a/review-2.6.22/usb-cdc-acm-fix-sysfs-attribute-registration-bug.patch b/review-2.6.22/usb-cdc-acm-fix-sysfs-attribute-registration-bug.patch
deleted file mode 100644 (file)
index a9d6c5b..0000000
--- a/review-2.6.22/usb-cdc-acm-fix-sysfs-attribute-registration-bug.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From stable-bounces@linux.kernel.org Wed Aug 22 15:27:24 2007
-From: Alan Stern <stern@rowland.harvard.edu>
-Date: Wed, 22 Aug 2007 15:15:18 -0700
-Subject: USB: cdc-acm: fix sysfs attribute registration bug
-To: linux-usb-devel@lists.sourceforge.net
-Cc: Greg Kroah-Hartman <gregkh@suse.de>, Alan Stern <stern@rowland.harvard.edu>, stable <stable@kernel.org>
-Message-ID: <11878209593215-git-send-email-gregkh@suse.de>
-
-
-From: Alan Stern <stern@rowland.harvard.edu>
-
-This patch (as950) fixes a bug in the cdc-acm driver.  It doesn't keep
-track of which interface (control or data) the sysfs attributes get
-registered for, and as a result, during disconnect it will sometimes
-attempt to remove the attributes from the wrong interface.  The
-left-over attributes can cause a crash later on, particularly if the driver
-module has been unloaded.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Acked-by: Oliver Neukum <oneukum@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/class/cdc-acm.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -900,6 +900,10 @@ next_desc:
-                       return -ENODEV;
-               }
-       }
-+
-+      /* Accept probe requests only for the control interface */
-+      if (intf != control_interface)
-+              return -ENODEV;
-       
-       if (data_interface_num != call_interface_num)
-               dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.");