From f633a98265587f3a5f23a6b87be2aec2d513bbbc Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Tue, 29 Aug 2006 22:07:07 -0500 Subject: [PATCH] --- yaml --- r: 36461 b: refs/heads/master c: 48298e50e0f7dfc7273ebfaa37ffd225428e83ed h: refs/heads/master i: 36459: fbbb31328abe7f900cdf5a20e5d57099c9e31ce7 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/cypress_m8.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9ed542dd1e79..5baca54741c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9aa8dae7b1fa7af099a403fc3766e068a0ea6d68 +refs/heads/master: 48298e50e0f7dfc7273ebfaa37ffd225428e83ed diff --git a/trunk/drivers/usb/serial/cypress_m8.c b/trunk/drivers/usb/serial/cypress_m8.c index 741dcec36d41..12a265c4a13b 100644 --- a/trunk/drivers/usb/serial/cypress_m8.c +++ b/trunk/drivers/usb/serial/cypress_m8.c @@ -367,9 +367,7 @@ static int cypress_serial_control (struct usb_serial_port *port, unsigned baud_m if (tries++ >= 3) break; - if (retval == EPIPE) - usb_clear_halt(port->serial->dev, 0x00); - } while (retval != 8 && retval != ENODEV); + } while (retval != 8 && retval != -ENODEV); if (retval != 8) err("%s - failed sending serial line settings - %d", __FUNCTION__, retval); @@ -394,9 +392,7 @@ static int cypress_serial_control (struct usb_serial_port *port, unsigned baud_m if (tries++ >= 3) break; - if (retval == EPIPE) - usb_clear_halt(port->serial->dev, 0x00); - } while (retval != 5 && retval != ENODEV); + } while (retval != 5 && retval != -ENODEV); if (retval != 5) { err("%s - failed to retrieve serial line settings - %d", __FUNCTION__, retval);