Commit 0d38edda authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  [PATCH] USB: fix omninet driver bug
  [PATCH] USB: add ark3116 usb to serial driver
  [PATCH] usbserial: Fixes leak in serial_open() error path.
  [PATCH] usbserial: Fixes use-after-free in serial_open().
  [PATCH] USB: Emagic USB firmware loading fixes
  [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist
  [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c
  [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface
  [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader
  [PATCH] USB: ub oops in block_uevent
  [PATCH] USB: usbcore: don't check the device's power source
  [PATCH] USB: fix OHCI PM regression
  [PATCH] USB: pegasus fixes (logstorm, suspend)
  [PATCH] USBATM: fix modinfo output
  [PATCH] USBATM: change the default speedtouch iso altsetting
  [PATCH] USB: fix bug in ohci-hcd.c ohci_restart()
parents 1a2acc9e df3fccb1
...@@ -536,6 +536,9 @@ static void ub_cleanup(struct ub_dev *sc) ...@@ -536,6 +536,9 @@ static void ub_cleanup(struct ub_dev *sc)
kfree(lun); kfree(lun);
} }
usb_set_intfdata(sc->intf, NULL);
usb_put_intf(sc->intf);
usb_put_dev(sc->dev);
kfree(sc); kfree(sc);
} }
...@@ -2221,7 +2224,12 @@ static int ub_probe(struct usb_interface *intf, ...@@ -2221,7 +2224,12 @@ static int ub_probe(struct usb_interface *intf,
// sc->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; // sc->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
usb_set_intfdata(intf, sc); usb_set_intfdata(intf, sc);
usb_get_dev(sc->dev); usb_get_dev(sc->dev);
// usb_get_intf(sc->intf); /* Do we need this? */ /*
* Since we give the interface struct to the block level through
* disk->driverfs_dev, we have to pin it. Otherwise, block_uevent
* oopses on close after a disconnect (kernels 2.6.16 and up).
*/
usb_get_intf(sc->intf);
snprintf(sc->name, 12, DRV_NAME "(%d.%d)", snprintf(sc->name, 12, DRV_NAME "(%d.%d)",
sc->dev->bus->busnum, sc->dev->devnum); sc->dev->bus->busnum, sc->dev->devnum);
...@@ -2286,7 +2294,7 @@ static int ub_probe(struct usb_interface *intf, ...@@ -2286,7 +2294,7 @@ static int ub_probe(struct usb_interface *intf,
err_dev_desc: err_dev_desc:
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
// usb_put_intf(sc->intf); usb_put_intf(sc->intf);
usb_put_dev(sc->dev); usb_put_dev(sc->dev);
kfree(sc); kfree(sc);
err_core: err_core:
...@@ -2461,12 +2469,6 @@ static void ub_disconnect(struct usb_interface *intf) ...@@ -2461,12 +2469,6 @@ static void ub_disconnect(struct usb_interface *intf)
* and no URBs left in transit. * and no URBs left in transit.
*/ */
usb_set_intfdata(intf, NULL);
// usb_put_intf(sc->intf);
sc->intf = NULL;
usb_put_dev(sc->dev);
sc->dev = NULL;
ub_put(sc); ub_put(sc);
} }
......
...@@ -69,7 +69,7 @@ static const char speedtch_driver_name[] = "speedtch"; ...@@ -69,7 +69,7 @@ static const char speedtch_driver_name[] = "speedtch";
#define RESUBMIT_DELAY 1000 /* milliseconds */ #define RESUBMIT_DELAY 1000 /* milliseconds */
#define DEFAULT_BULK_ALTSETTING 1 #define DEFAULT_BULK_ALTSETTING 1
#define DEFAULT_ISOC_ALTSETTING 2 #define DEFAULT_ISOC_ALTSETTING 3
#define DEFAULT_DL_512_FIRST 0 #define DEFAULT_DL_512_FIRST 0
#define DEFAULT_ENABLE_ISOC 0 #define DEFAULT_ENABLE_ISOC 0
#define DEFAULT_SW_BUFFERING 0 #define DEFAULT_SW_BUFFERING 0
......
...@@ -99,11 +99,11 @@ static const char usbatm_driver_name[] = "usbatm"; ...@@ -99,11 +99,11 @@ static const char usbatm_driver_name[] = "usbatm";
#define UDSL_MAX_RCV_URBS 16 #define UDSL_MAX_RCV_URBS 16
#define UDSL_MAX_SND_URBS 16 #define UDSL_MAX_SND_URBS 16
#define UDSL_MAX_BUF_SIZE 64 * 1024 /* bytes */ #define UDSL_MAX_BUF_SIZE 65536
#define UDSL_DEFAULT_RCV_URBS 4 #define UDSL_DEFAULT_RCV_URBS 4
#define UDSL_DEFAULT_SND_URBS 4 #define UDSL_DEFAULT_SND_URBS 4
#define UDSL_DEFAULT_RCV_BUF_SIZE 64 * ATM_CELL_SIZE /* bytes */ #define UDSL_DEFAULT_RCV_BUF_SIZE 3392 /* 64 * ATM_CELL_SIZE */
#define UDSL_DEFAULT_SND_BUF_SIZE 64 * ATM_CELL_SIZE /* bytes */ #define UDSL_DEFAULT_SND_BUF_SIZE 3392 /* 64 * ATM_CELL_SIZE */
#define ATM_CELL_HEADER (ATM_CELL_SIZE - ATM_CELL_PAYLOAD) #define ATM_CELL_HEADER (ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
...@@ -135,7 +135,7 @@ MODULE_PARM_DESC(rcv_buf_bytes, ...@@ -135,7 +135,7 @@ MODULE_PARM_DESC(rcv_buf_bytes,
module_param(snd_buf_bytes, uint, S_IRUGO); module_param(snd_buf_bytes, uint, S_IRUGO);
MODULE_PARM_DESC(snd_buf_bytes, MODULE_PARM_DESC(snd_buf_bytes,
"Size of the buffers used for transmission, in bytes (range: 1-" "Size of the buffers used for transmission, in bytes (range: 1-"
__MODULE_STRING(UDSL_MAX_SND_BUF_SIZE) ", default: " __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: "
__MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")"); __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")");
......
...@@ -1805,6 +1805,12 @@ int usb_add_hcd(struct usb_hcd *hcd, ...@@ -1805,6 +1805,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
USB_SPEED_FULL; USB_SPEED_FULL;
hcd->self.root_hub = rhdev; hcd->self.root_hub = rhdev;
/* wakeup flag init defaults to "everything works" for root hubs,
* but drivers can override it in reset() if needed, along with
* recording the overall controller's system wakeup capability.
*/
device_init_wakeup(&rhdev->dev, 1);
/* "reset" is misnamed; its role is now one-time init. the controller /* "reset" is misnamed; its role is now one-time init. the controller
* should already have been reset (and boot firmware kicked off etc). * should already have been reset (and boot firmware kicked off etc).
*/ */
...@@ -1813,13 +1819,6 @@ int usb_add_hcd(struct usb_hcd *hcd, ...@@ -1813,13 +1819,6 @@ int usb_add_hcd(struct usb_hcd *hcd,
goto err_hcd_driver_setup; goto err_hcd_driver_setup;
} }
/* wakeup flag init is in transition; for now we can't rely on PCI to
* initialize these bits properly, so we let reset() override it.
* This init should _precede_ the reset() once PCI behaves.
*/
device_init_wakeup(&rhdev->dev,
device_can_wakeup(hcd->self.controller));
/* NOTE: root hub and controller capabilities may not be the same */ /* NOTE: root hub and controller capabilities may not be the same */
if (device_can_wakeup(hcd->self.controller) if (device_can_wakeup(hcd->self.controller)
&& device_can_wakeup(&hcd->self.root_hub->dev)) && device_can_wakeup(&hcd->self.root_hub->dev))
......
...@@ -1168,19 +1168,9 @@ static inline const char *plural(int n) ...@@ -1168,19 +1168,9 @@ static inline const char *plural(int n)
static int choose_configuration(struct usb_device *udev) static int choose_configuration(struct usb_device *udev)
{ {
int i; int i;
u16 devstatus;
int bus_powered;
int num_configs; int num_configs;
struct usb_host_config *c, *best; struct usb_host_config *c, *best;
/* If this fails, assume the device is bus-powered */
devstatus = 0;
usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
le16_to_cpus(&devstatus);
bus_powered = ((devstatus & (1 << USB_DEVICE_SELF_POWERED)) == 0);
dev_dbg(&udev->dev, "device is %s-powered\n",
bus_powered ? "bus" : "self");
best = NULL; best = NULL;
c = udev->config; c = udev->config;
num_configs = udev->descriptor.bNumConfigurations; num_configs = udev->descriptor.bNumConfigurations;
...@@ -1197,6 +1187,19 @@ static int choose_configuration(struct usb_device *udev) ...@@ -1197,6 +1187,19 @@ static int choose_configuration(struct usb_device *udev)
* similar errors in their descriptors. If the next test * similar errors in their descriptors. If the next test
* were allowed to execute, such configurations would always * were allowed to execute, such configurations would always
* be rejected and the devices would not work as expected. * be rejected and the devices would not work as expected.
* In the meantime, we run the risk of selecting a config
* that requires external power at a time when that power
* isn't available. It seems to be the lesser of two evils.
*
* Bugzilla #6448 reports a device that appears to crash
* when it receives a GET_DEVICE_STATUS request! We don't
* have any other way to tell whether a device is self-powered,
* but since we don't use that information anywhere but here,
* the call has been removed.
*
* Maybe the GET_DEVICE_STATUS call and the test below can
* be reinstated when device firmwares become more reliable.
* Don't hold your breath.
*/ */
#if 0 #if 0
/* Rule out self-powered configs for a bus-powered device */ /* Rule out self-powered configs for a bus-powered device */
......
...@@ -863,7 +863,7 @@ static int ohci_restart (struct ohci_hcd *ohci) ...@@ -863,7 +863,7 @@ static int ohci_restart (struct ohci_hcd *ohci)
i = ohci->num_ports; i = ohci->num_ports;
while (i--) while (i--)
ohci_writel (ohci, RH_PS_PSS, ohci_writel (ohci, RH_PS_PSS,
&ohci->regs->roothub.portstatus [temp]); &ohci->regs->roothub.portstatus [i]);
ohci_dbg (ohci, "restart complete\n"); ohci_dbg (ohci, "restart complete\n");
} }
return 0; return 0;
......
...@@ -1557,6 +1557,9 @@ void hid_init_reports(struct hid_device *hid) ...@@ -1557,6 +1557,9 @@ void hid_init_reports(struct hid_device *hid)
#define USB_VENDOR_ID_HP 0x03f0 #define USB_VENDOR_ID_HP 0x03f0
#define USB_DEVICE_ID_HP_USBHUB_KB 0x020c #define USB_DEVICE_ID_HP_USBHUB_KB 0x020c
#define USB_VENDOR_ID_IBM 0x04b3
#define USB_DEVICE_ID_IBM_USBHUB_KB 0x3005
#define USB_VENDOR_ID_CREATIVELABS 0x062a #define USB_VENDOR_ID_CREATIVELABS 0x062a
#define USB_DEVICE_ID_CREATIVELABS_SILVERCREST 0x0201 #define USB_DEVICE_ID_CREATIVELABS_SILVERCREST 0x0201
...@@ -1681,6 +1684,7 @@ static const struct hid_blacklist { ...@@ -1681,6 +1684,7 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET}, { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET }, { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET }, { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_USBHUB_KB, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET }, { USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET },
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/delay.h>
#define MAX_INTEL_HEX_RECORD_LENGTH 16 #define MAX_INTEL_HEX_RECORD_LENGTH 16
typedef struct _INTEL_HEX_RECORD typedef struct _INTEL_HEX_RECORD
...@@ -114,6 +115,7 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -114,6 +115,7 @@ static int emi26_load_firmware (struct usb_device *dev)
/* De-assert reset (let the CPU run) */ /* De-assert reset (let the CPU run) */
err = emi26_set_reset(dev,0); err = emi26_set_reset(dev,0);
msleep(250); /* let device settle */
/* 2. We upload the FPGA firmware into the EMI /* 2. We upload the FPGA firmware into the EMI
* Note: collect up to 1023 (yes!) bytes and send them with * Note: collect up to 1023 (yes!) bytes and send them with
...@@ -150,6 +152,7 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -150,6 +152,7 @@ static int emi26_load_firmware (struct usb_device *dev)
goto wraperr; goto wraperr;
} }
} }
msleep(250); /* let device settle */
/* De-assert reset (let the CPU run) */ /* De-assert reset (let the CPU run) */
err = emi26_set_reset(dev,0); err = emi26_set_reset(dev,0);
...@@ -192,6 +195,7 @@ static int emi26_load_firmware (struct usb_device *dev) ...@@ -192,6 +195,7 @@ static int emi26_load_firmware (struct usb_device *dev)
err("%s - error loading firmware: error = %d", __FUNCTION__, err); err("%s - error loading firmware: error = %d", __FUNCTION__, err);
goto wraperr; goto wraperr;
} }
msleep(250); /* let device settle */
/* return 1 to fail the driver inialization /* return 1 to fail the driver inialization
* and give real driver change to load */ * and give real driver change to load */
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/delay.h>
#define MAX_INTEL_HEX_RECORD_LENGTH 16 #define MAX_INTEL_HEX_RECORD_LENGTH 16
typedef struct _INTEL_HEX_RECORD typedef struct _INTEL_HEX_RECORD
...@@ -123,6 +124,7 @@ static int emi62_load_firmware (struct usb_device *dev) ...@@ -123,6 +124,7 @@ static int emi62_load_firmware (struct usb_device *dev)
/* De-assert reset (let the CPU run) */ /* De-assert reset (let the CPU run) */
err = emi62_set_reset(dev,0); err = emi62_set_reset(dev,0);
msleep(250); /* let device settle */
/* 2. We upload the FPGA firmware into the EMI /* 2. We upload the FPGA firmware into the EMI
* Note: collect up to 1023 (yes!) bytes and send them with * Note: collect up to 1023 (yes!) bytes and send them with
...@@ -166,6 +168,7 @@ static int emi62_load_firmware (struct usb_device *dev) ...@@ -166,6 +168,7 @@ static int emi62_load_firmware (struct usb_device *dev)
err("%s - error loading firmware: error = %d", __FUNCTION__, err); err("%s - error loading firmware: error = %d", __FUNCTION__, err);
goto wraperr; goto wraperr;
} }
msleep(250); /* let device settle */
/* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */ /* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */
...@@ -228,6 +231,7 @@ static int emi62_load_firmware (struct usb_device *dev) ...@@ -228,6 +231,7 @@ static int emi62_load_firmware (struct usb_device *dev)
err("%s - error loading firmware: error = %d", __FUNCTION__, err); err("%s - error loading firmware: error = %d", __FUNCTION__, err);
goto wraperr; goto wraperr;
} }
msleep(250); /* let device settle */
kfree(buf); kfree(buf);
......
...@@ -318,6 +318,8 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd) ...@@ -318,6 +318,8 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
set_register(pegasus, PhyCtrl, (indx | PHY_READ)); set_register(pegasus, PhyCtrl, (indx | PHY_READ));
for (i = 0; i < REG_TIMEOUT; i++) { for (i = 0; i < REG_TIMEOUT; i++) {
ret = get_registers(pegasus, PhyCtrl, 1, data); ret = get_registers(pegasus, PhyCtrl, 1, data);
if (ret == -ESHUTDOWN)
goto fail;
if (data[0] & PHY_DONE) if (data[0] & PHY_DONE)
break; break;
} }
...@@ -326,6 +328,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd) ...@@ -326,6 +328,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
*regd = le16_to_cpu(regdi); *regd = le16_to_cpu(regdi);
return ret; return ret;
} }
fail:
if (netif_msg_drv(pegasus)) if (netif_msg_drv(pegasus))
dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__); dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
...@@ -354,12 +357,15 @@ static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd) ...@@ -354,12 +357,15 @@ static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd)
set_register(pegasus, PhyCtrl, (indx | PHY_WRITE)); set_register(pegasus, PhyCtrl, (indx | PHY_WRITE));
for (i = 0; i < REG_TIMEOUT; i++) { for (i = 0; i < REG_TIMEOUT; i++) {
ret = get_registers(pegasus, PhyCtrl, 1, data); ret = get_registers(pegasus, PhyCtrl, 1, data);
if (ret == -ESHUTDOWN)
goto fail;
if (data[0] & PHY_DONE) if (data[0] & PHY_DONE)
break; break;
} }
if (i < REG_TIMEOUT) if (i < REG_TIMEOUT)
return ret; return ret;
fail:
if (netif_msg_drv(pegasus)) if (netif_msg_drv(pegasus))
dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__); dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
return -ETIMEDOUT; return -ETIMEDOUT;
...@@ -387,6 +393,8 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata) ...@@ -387,6 +393,8 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata)
ret = get_registers(pegasus, EpromCtrl, 1, &tmp); ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
if (tmp & EPROM_DONE) if (tmp & EPROM_DONE)
break; break;
if (ret == -ESHUTDOWN)
goto fail;
} }
if (i < REG_TIMEOUT) { if (i < REG_TIMEOUT) {
ret = get_registers(pegasus, EpromData, 2, &retdatai); ret = get_registers(pegasus, EpromData, 2, &retdatai);
...@@ -394,6 +402,7 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata) ...@@ -394,6 +402,7 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata)
return ret; return ret;
} }
fail:
if (netif_msg_drv(pegasus)) if (netif_msg_drv(pegasus))
dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__); dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
return -ETIMEDOUT; return -ETIMEDOUT;
...@@ -433,12 +442,15 @@ static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data) ...@@ -433,12 +442,15 @@ static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data)
for (i = 0; i < REG_TIMEOUT; i++) { for (i = 0; i < REG_TIMEOUT; i++) {
ret = get_registers(pegasus, EpromCtrl, 1, &tmp); ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
if (ret == -ESHUTDOWN)
goto fail;
if (tmp & EPROM_DONE) if (tmp & EPROM_DONE)
break; break;
} }
disable_eprom_write(pegasus); disable_eprom_write(pegasus);
if (i < REG_TIMEOUT) if (i < REG_TIMEOUT)
return ret; return ret;
fail:
if (netif_msg_drv(pegasus)) if (netif_msg_drv(pegasus))
dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__); dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
return -ETIMEDOUT; return -ETIMEDOUT;
...@@ -1378,9 +1390,8 @@ static int pegasus_suspend (struct usb_interface *intf, pm_message_t message) ...@@ -1378,9 +1390,8 @@ static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
struct pegasus *pegasus = usb_get_intfdata(intf); struct pegasus *pegasus = usb_get_intfdata(intf);
netif_device_detach (pegasus->net); netif_device_detach (pegasus->net);
cancel_delayed_work(&pegasus->carrier_check);
if (netif_running(pegasus->net)) { if (netif_running(pegasus->net)) {
cancel_delayed_work(&pegasus->carrier_check);
usb_kill_urb(pegasus->rx_urb); usb_kill_urb(pegasus->rx_urb);
usb_kill_urb(pegasus->intr_urb); usb_kill_urb(pegasus->intr_urb);
} }
...@@ -1400,10 +1411,9 @@ static int pegasus_resume (struct usb_interface *intf) ...@@ -1400,10 +1411,9 @@ static int pegasus_resume (struct usb_interface *intf)
pegasus->intr_urb->status = 0; pegasus->intr_urb->status = 0;
pegasus->intr_urb->actual_length = 0; pegasus->intr_urb->actual_length = 0;
intr_callback(pegasus->intr_urb, NULL); intr_callback(pegasus->intr_urb, NULL);
queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
CARRIER_CHECK_DELAY);
} }
queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
CARRIER_CHECK_DELAY);
return 0; return 0;
} }
......
...@@ -71,6 +71,16 @@ config USB_SERIAL_ANYDATA ...@@ -71,6 +71,16 @@ config USB_SERIAL_ANYDATA
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called anydata. module will be called anydata.
config USB_SERIAL_ARK3116
tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
depends on USB_SERIAL && EXPERIMENTAL
help
Say Y here if you want to use a ARK Micro 3116 USB to Serial
device.
To compile this driver as a module, choose M here: the
module will be called ark3116
config USB_SERIAL_BELKIN config USB_SERIAL_BELKIN
tristate "USB Belkin and Peracom Single Port Serial Driver" tristate "USB Belkin and Peracom Single Port Serial Driver"
depends on USB_SERIAL depends on USB_SERIAL
......
...@@ -13,6 +13,7 @@ usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y) ...@@ -13,6 +13,7 @@ usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y)
obj-$(CONFIG_USB_SERIAL_AIRPRIME) += airprime.o obj-$(CONFIG_USB_SERIAL_AIRPRIME) += airprime.o
obj-$(CONFIG_USB_SERIAL_ANYDATA) += anydata.o obj-$(CONFIG_USB_SERIAL_ANYDATA) += anydata.o
obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o
obj-$(CONFIG_USB_SERIAL_BELKIN) += belkin_sa.o obj-$(CONFIG_USB_SERIAL_BELKIN) += belkin_sa.o
obj-$(CONFIG_USB_SERIAL_CP2101) += cp2101.o obj-$(CONFIG_USB_SERIAL_CP2101) += cp2101.o
obj-$(CONFIG_USB_SERIAL_CYBERJACK) += cyberjack.o obj-$(CONFIG_USB_SERIAL_CYBERJACK) += cyberjack.o
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
static struct usb_device_id id_table [] = { static struct usb_device_id id_table [] = {
{ USB_DEVICE(0xf3d, 0x0112) }, /* AirPrime CDMA Wireless PC Card */ { USB_DEVICE(0xf3d, 0x0112) }, /* AirPrime CDMA Wireless PC Card */
{ USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */ { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
{ USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless Aircard 580 */
{ }, { },
}; };
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
......
This diff is collapsed.
...@@ -307,6 +307,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = { ...@@ -307,6 +307,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
static struct usb_device_id id_table_combined [] = { static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_SIO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
...@@ -498,6 +499,7 @@ static struct usb_device_id id_table_combined [] = { ...@@ -498,6 +499,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
{ }, /* Optional parameter entry */ { }, /* Optional parameter entry */
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
......
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#define FTDI_NF_RIC_PID 0x0001 /* Product Id */ #define FTDI_NF_RIC_PID 0x0001 /* Product Id */
/* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
#define FTDI_ACTZWAVE_PID 0xF2D0
/* www.irtrans.de device */ /* www.irtrans.de device */
#define FTDI_IRTRANS_PID 0xFC60 /* Product Id */ #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */
...@@ -426,6 +430,11 @@ ...@@ -426,6 +430,11 @@
#define PAPOUCH_VID 0x5050 /* Vendor ID */ #define PAPOUCH_VID 0x5050 /* Vendor ID */
#define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */ #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */
/*
* ACG Identification Technologies GmbH products (http://www.acg.de/).
* Submitted by anton -at- goto10 -dot- org.
*/
#define FTDI_ACG_HFDUAL_PID 0xDD20 /* HF Dual ISO Reader (RFID) */
/* Commands */ /* Commands */
#define FTDI_SIO_RESET 0 /* Reset the port */ #define FTDI_SIO_RESET 0 /* Reset the port */
......
...@@ -138,6 +138,7 @@ int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp) ...@@ -138,6 +138,7 @@ int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp)
return result; return result;
} }
EXPORT_SYMBOL_GPL(usb_serial_generic_open);
static void generic_cleanup (struct usb_serial_port *port) static void generic_cleanup (struct usb_serial_port *port)
{ {
......
...@@ -257,14 +257,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf ...@@ -257,14 +257,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
return (0); return (0);
} }
spin_lock(&port->lock); spin_lock(&wport->lock);
if (port->write_urb_busy) { if (wport->write_urb_busy) {
spin_unlock(&port->lock); spin_unlock(&wport->lock);
dbg("%s - already writing", __FUNCTION__); dbg("%s - already writing", __FUNCTION__);
return 0; return 0;
} }
port->write_urb_busy = 1; wport->write_urb_busy = 1;
spin_unlock(&port->lock); spin_unlock(&wport->lock);
count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count; count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count;
...@@ -283,7 +283,7 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf ...@@ -283,7 +283,7 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
wport->write_urb->dev = serial->dev; wport->write_urb->dev = serial->dev;
result = usb_submit_urb(wport->write_urb, GFP_ATOMIC); result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
if (result) { if (result) {
port->write_urb_busy = 0; wport->write_urb_busy = 0;
err("%s - failed submitting write urb, error %d", __FUNCTION__, result); err("%s - failed submitting write urb, error %d", __FUNCTION__, result);
} else } else
result = count; result = count;
......
...@@ -189,11 +189,15 @@ static int serial_open (struct tty_struct *tty, struct file * filp) ...@@ -189,11 +189,15 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
portNumber = tty->index - serial->minor; portNumber = tty->index - serial->minor;
port = serial->port[portNumber]; port = serial->port[portNumber];
if (!port) if (!port) {
return -ENODEV; retval = -ENODEV;
goto bailout_kref_put;
}
if (mutex_lock_interruptible(&port->mutex)) if (mutex_lock_interruptible(&port->mutex)) {
return -ERESTARTSYS; retval = -ERESTARTSYS;
goto bailout_kref_put;
}
++port->open_count; ++port->open_count;
...@@ -209,7 +213,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp) ...@@ -209,7 +213,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
* safe because we are called with BKL held */ * safe because we are called with BKL held */
if (!try_module_get(serial->type->driver.owner)) { if (!try_module_get(serial->type->driver.owner)) {
retval = -ENODEV; retval = -ENODEV;
goto bailout_kref_put; goto bailout_mutex_unlock;
} }
/* only call the device specific open if this /* only call the device specific open if this
...@@ -224,10 +228,11 @@ static int serial_open (struct tty_struct *tty, struct file * filp) ...@@ -224,10 +228,11 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
bailout_module_put: bailout_module_put:
module_put(serial->type->driver.owner); module_put(serial->type->driver.owner);
bailout_kref_put: bailout_mutex_unlock:
kref_put(&serial->kref, destroy_serial);
port->open_count = 0; port->open_count = 0;
mutex_unlock(&port->mutex); mutex_unlock(&port->mutex);
bailout_kref_put:
kref_put(&serial->kref, destroy_serial);
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment