diff options
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index ef6cfa5a447f..75597337583e 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -660,6 +660,8 @@ static struct usb_device_id id_table_combined [] = {  	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },  	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) },  	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) }, +	{ USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) }, +	{ USB_DEVICE(FTDI_VID, DIEBOLD_BCS_SE923_PID) },  	{ },					/* Optional parameter entry */  	{ }					/* Terminating entry */  }; @@ -2030,7 +2032,7 @@ static void ftdi_process_read(struct work_struct *work)  			spin_unlock_irqrestore(&priv->rx_lock, flags);  			dbg("%s - deferring remainder until unthrottled",  					__func__); -			return; +			goto out;  		}  		spin_unlock_irqrestore(&priv->rx_lock, flags);  		/* if the port is closed stop trying to read */ | 
