Skip to contentSkip to conversation

STAGING patches for 2.6.30-rc4 tree

PATCH New Greg KH 2 participants 5 messages May 9, 2009 Staging

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 STAGING patches for 2.6.30-rc4 tree

Here are some patches for your 2.6.30-rc4 git tree.

It contains:
- a new device id.
- documentation update to keep someone from getting unwanted emails.
- 2 bugfixes

All of these are contained within the drivers/staging tree, and have been in the linux-next and -mm trees for a while now.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/

thanks,

greg k-h

--------------

 drivers/staging/comedi/TODO            |    1 -
 drivers/staging/rt2870/rt2870.h        |    1 +
 drivers/staging/rtl8187se/r8180.h      |    2 +-
 drivers/staging/rtl8187se/r8180_core.c |   46 +++++--------------------------
 drivers/staging/winbond/wbusb.c        |    9 +++++-
 5 files changed, 17 insertions(+), 42 deletions(-)

---------------

Dave Hayes (1):
Staging: rt2870: new device id

Greg Kroah-Hartman (1):
Staging: comedi: David doesn't want to get comedi patches

Larry Finger (1):
Staging: rtl8187se: Fix compilation warnings and procfs directory leak

Pekka Enberg (1):

      Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect()
#1 lore raw

PATCH 1/4 Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect()

From: Pekka Enberg <[email protected]>

Impact: fix module removal

This patch fixes an oops when the w35und module is removed from the kernel and added back.

---
 drivers/staging/winbond/wbusb.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/staging/winbond/wbusb.c +7 -2
index 9c3f943..3b2d528 100644
@@ -386,7 +386,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
 	if (err)
 		goto error_free_hw;
 
-	usb_set_intfdata(intf, priv);
+	usb_set_intfdata(intf, dev);
 
 	return 0;
 
@@ -415,10 +415,15 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter)
 
 static void wb35_disconnect(struct usb_interface *intf)
 {
-	struct wbsoft_priv *priv = usb_get_intfdata(intf);
+	struct ieee80211_hw *hw = usb_get_intfdata(intf);
+	struct wbsoft_priv *priv = hw->priv;
 
 	wb35_hw_halt(priv);
 
+	ieee80211_stop_queues(hw);
+	ieee80211_unregister_hw(hw);
+	ieee80211_free_hw(hw);
+
 	usb_set_intfdata(intf, NULL);
 	usb_put_dev(interface_to_usbdev(intf));
 }
Signature · 1 line
1.6.3
#2 lore raw

PATCH 2/4 Staging: rt2870: new device id

In reply to Greg KH

From: Dave Hayes <[email protected]>

Hey, I have an Edimax wireless USB adapter that uses the rt2870 chipset. lsusb shows it as follows:

Bus 001 Device 002: ID 7392:7717

When I added that ID to rt2870.h, the device came up and worked as expected.

From: Dave Hayes <[email protected]>

---
 drivers/staging/rt2870/rt2870.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/staging/rt2870/rt2870.h +1 -0
index a42caa3..a69cf33 100644
@@ -145,6 +145,7 @@
 	{USB_DEVICE(0x0789,0x0162)}, /* Logitec */		\
 	{USB_DEVICE(0x0789,0x0163)}, /* Logitec */		\
 	{USB_DEVICE(0x0789,0x0164)}, /* Logitec */		\
+	{USB_DEVICE(0x7392,0x7717)}, /* Edimax */		\
 	{ }/* Terminating entry */                      \
 }
 
Signature · 1 line
1.6.3
#3 lore raw

PATCH 3/4 Staging: rtl8187se: Fix compilation warnings and procfs directory leak

In reply to Greg KH

From: Larry Finger <[email protected]>

Fix some warnings during compilation and correct a programming error that was leaking a directory in /proc.

---
 drivers/staging/rtl8187se/r8180.h      |    2 +-
 drivers/staging/rtl8187se/r8180_core.c |   46 +++++--------------------------
 2 files changed, 9 insertions(+), 39 deletions(-)
drivers/staging/rtl8187se/r8180.h +1 -1
index 12215fc..db446b7 100644
@@ -19,7 +19,7 @@
 #define R8180H
 
 
-#define RTL8180_MODULE_NAME "rtl8180"
+#define RTL8180_MODULE_NAME "r8180"
 #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a)
 #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a)
 #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a)
drivers/staging/rtl8187se/r8180_core.c +8 -38

95 lines not on this page · raw message

Signature · 1 line
1.6.3
#4 lore raw

PATCH 4/4 Staging: comedi: David doesn't want to get comedi patches

In reply to Greg KH

He's long moved on from the project.

---
 drivers/staging/comedi/TODO |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/staging/comedi/TODO +0 -1
index 5578129..15c9348 100644
@@ -11,4 +11,3 @@ Please send patches to Greg Kroah-Hartman <[email protected]> and
 copy:
 	Ian Abbott <[email protected]>
 	Frank Mori Hess <[email protected]>
-	David Schleef <[email protected]>
Signature · 1 line
1.6.3