diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-10-04 09:10:13 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-10-04 09:10:13 +0200 |
| commit | 53f10d0ac9d7b46a40aafa970f985ba73caf33fc (patch) | |
| tree | bdcb00cad408f24b742a650696374c1ed3ab0b5a /drivers/net/usb | |
| parent | 12ddb12ff7f9b8c3463c659f10ba69adf2530490 (diff) | |
| download | kernel_goldelico_gta04-53f10d0ac9d7b46a40aafa970f985ba73caf33fc.zip kernel_goldelico_gta04-53f10d0ac9d7b46a40aafa970f985ba73caf33fc.tar.gz kernel_goldelico_gta04-53f10d0ac9d7b46a40aafa970f985ba73caf33fc.tar.bz2 | |
reverted hso driver to mainline so that we can put our latest patch on top
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/hso.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 79a30b4..86292e6 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -72,7 +72,6 @@ #include <linux/serial_core.h> #include <linux/serial.h> -#include <linux/pm_runtime.h> #define MOD_AUTHOR "Option Wireless" #define MOD_DESCRIPTION "USB High Speed Option driver" @@ -1504,8 +1503,7 @@ static void tiocmget_intr_callback(struct urb *urb) if (serial_state_notification->bmRequestType != BM_REQUEST_TYPE || serial_state_notification->bNotification != B_NOTIFICATION || le16_to_cpu(serial_state_notification->wValue) != W_VALUE || - /* fix problem with GTM601 and 1.7 firmware; see http://lists.goldelico.com/pipermail/gta04-owner/2012-February/001643.html */ - (le16_to_cpu(serial_state_notification->wIndex) & ~0x4) != W_INDEX || + le16_to_cpu(serial_state_notification->wIndex) != W_INDEX || le16_to_cpu(serial_state_notification->wLength) != W_LENGTH) { dev_warn(&usb->dev, "hso received invalid serial state notification\n"); @@ -2967,8 +2965,6 @@ static int hso_probe(struct usb_interface *interface, /* save our data pointer in this device */ usb_set_intfdata(interface, hso_dev); - pm_runtime_allow(&hso_dev->usb->dev); - /* done */ return 0; exit: |