From 1ea15a24fd86b0eba56758bd26b62c86d528ec96 Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Mon, 21 Feb 2011 12:58:44 +0530 Subject: [PATCH] --- yaml --- r: 235343 b: refs/heads/master c: d866150a1914453c3d57689adfd8d01bf741d9d4 h: refs/heads/master i: 235341: 1b737576b6b93d186c5eaec115409c224731f77e 235339: 54e684753ed012e13e6ce87092ef5c31356a6db6 235335: bb26888b3d53d9d2f4ba87db9d9e8677f2ade27b 235327: cdbfeb635dca5af131e69a888e31c9f441342d95 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/keyspan.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dcedd2605d26..5367bfcbc178 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 108be95f9ffc53660c9a35b5ceef94121b1e23c4 +refs/heads/master: d866150a1914453c3d57689adfd8d01bf741d9d4 diff --git a/trunk/drivers/usb/serial/keyspan.c b/trunk/drivers/usb/serial/keyspan.c index 0791778a66f3..67f41b526570 100644 --- a/trunk/drivers/usb/serial/keyspan.c +++ b/trunk/drivers/usb/serial/keyspan.c @@ -2121,16 +2121,16 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, /* Work out which port within the device is being setup */ device_port = port->number - port->serial->minor; - dbg("%s - endpoint %d port %d (%d)", - __func__, usb_pipeendpoint(this_urb->pipe), - port->number, device_port); - - /* Make sure we have an urb then send the message */ + /* Make sure we have an urb then send the message */ if (this_urb == NULL) { dbg("%s - oops no urb for port %d.", __func__, port->number); return -1; } + dbg("%s - endpoint %d port %d (%d)", + __func__, usb_pipeendpoint(this_urb->pipe), + port->number, device_port); + /* Save reset port val for resend. Don't overwrite resend for open/close condition. */ if ((reset_port + 1) > p_priv->resend_cont)