aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.c16
2 files changed, 8 insertions, 10 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index e50419d08996..91ba1e939475 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -279,7 +279,7 @@ static void pxa_init_debugfs(struct pxa_udc *udc)
279 goto err_queues; 279 goto err_queues;
280 eps = debugfs_create_file("epstate", 0400, root, udc, 280 eps = debugfs_create_file("epstate", 0400, root, udc,
281 &eps_dbg_fops); 281 &eps_dbg_fops);
282 if (!queues) 282 if (!eps)
283 goto err_eps; 283 goto err_eps;
284 284
285 udc->debugfs_root = root; 285 udc->debugfs_root = root;
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index ae84c326a540..d889216bcb30 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1938,15 +1938,13 @@ static void ftdi_process_read(struct work_struct *work)
1938 /* Compare new line status to the old one, signal if different/ 1938 /* Compare new line status to the old one, signal if different/
1939 N.B. packet may be processed more than once, but differences 1939 N.B. packet may be processed more than once, but differences
1940 are only processed once. */ 1940 are only processed once. */
1941 if (priv != NULL) { 1941 char new_status = data[packet_offset + 0] &
1942 char new_status = data[packet_offset + 0] & 1942 FTDI_STATUS_B0_MASK;
1943 FTDI_STATUS_B0_MASK; 1943 if (new_status != priv->prev_status) {
1944 if (new_status != priv->prev_status) { 1944 priv->diff_status |=
1945 priv->diff_status |= 1945 new_status ^ priv->prev_status;
1946 new_status ^ priv->prev_status; 1946 wake_up_interruptible(&priv->delta_msr_wait);
1947 wake_up_interruptible(&priv->delta_msr_wait); 1947 priv->prev_status = new_status;
1948 priv->prev_status = new_status;
1949 }
1950 } 1948 }
1951 1949
1952 length = min(PKTSZ, urb->actual_length-packet_offset)-2; 1950 length = min(PKTSZ, urb->actual_length-packet_offset)-2;