2 files changed, 15 insertions, 8 deletions

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 8f58f7ff0dd7..b3497d7e5354 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -1020,7 +1020,8 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 
         /* Get current mode register */
         mode = UART_GET_MR(port) & ~(ATMEL_US_USCLKS | ATMEL_US_CHRL
-                                        | ATMEL_US_NBSTOP | ATMEL_US_PAR);
+                                        | ATMEL_US_NBSTOP | ATMEL_US_PAR
+                                        | ATMEL_US_USMODE);
 
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
         quot = uart_get_divisor(port, baud);
@@ -1065,6 +1066,12 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
         } else
                 mode |= ATMEL_US_PAR_NONE;
 
+        /* hardware handshake (RTS/CTS) */
+        if (termios->c_cflag & CRTSCTS)
+                mode |= ATMEL_US_USMODE_HWHS;
+        else
+                mode |= ATMEL_US_USMODE_NORMAL;
+
         spin_lock_irqsave(&port->lock, flags);
 
         port->read_status_mask = ATMEL_US_OVRE;
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index c22fab164113..563d57275448 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -319,7 +319,7 @@ static inline void usba_cleanup_debugfs(struct usba_udc *udc)
 
 static int vbus_is_present(struct usba_udc *udc)
 {
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 return gpio_get_value(udc->vbus_pin);
 
         /* No Vbus detection: Assume always present */
@@ -1821,7 +1821,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         DBG(DBG_GADGET, "registered driver `%s'\n", driver->driver.name);
 
         udc->vbus_prev = 0;
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 enable_irq(gpio_to_irq(udc->vbus_pin));
 
         /* If Vbus is present, enable the controller and wait for reset */
@@ -1852,7 +1852,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         if (driver != udc->driver || !driver->unbind)
                 return -EINVAL;
 
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 disable_irq(gpio_to_irq(udc->vbus_pin));
 
         spin_lock_irqsave(&udc->lock, flags);
@@ -1910,7 +1910,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
         udc->pdev = pdev;
         udc->pclk = pclk;
         udc->hclk = hclk;
-        udc->vbus_pin = -1;
+        udc->vbus_pin = -ENODEV;
 
         ret = -ENOMEM;
         udc->regs = ioremap(regs->start, regs->end - regs->start + 1);
@@ -1996,7 +1996,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
                 goto err_device_add;
         }
 
-        if (pdata->vbus_pin >= 0) {
+        if (gpio_is_valid(pdata->vbus_pin)) {
                 if (!gpio_request(pdata->vbus_pin, "atmel_usba_udc")) {
                         udc->vbus_pin = pdata->vbus_pin;
 
@@ -2005,7 +2005,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
                                         "atmel_usba_udc", udc);
                         if (ret) {
                                 gpio_free(udc->vbus_pin);
-                                udc->vbus_pin = -1;
+                                udc->vbus_pin = -ENODEV;
                                 dev_warn(&udc->pdev->dev,
                                          "failed to request vbus irq; "
                                          "assuming always on\n");
@@ -2051,7 +2051,7 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
                 usba_ep_cleanup_debugfs(&usba_ep[i]);
         usba_cleanup_debugfs(udc);
 
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 gpio_free(udc->vbus_pin);
 
         free_irq(udc->irq, udc);