Convert files to UTF-8 and some cleanups

[net-next-2.6.git] / drivers / usb / serial / ftdi_sio.c

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 1370c423d7c28bbfb967d1d42262a2628d33e616..8a8a6b9fb05bf3bc1253bb9c08398fd749aadaf4 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -83,7 +83,7 @@
  *
  * (18/Jun/2003) Ian Abbott
  *      Added Device ID of the USB relais from Rudolf Gugler (backported from
- *      Philipp G�hring's patch for 2.5.x kernel).
+ *      Philipp Gühring's patch for 2.5.x kernel).
  *      Moved read transfer buffer reallocation into startup function.
  *      Free existing write urb and transfer buffer in startup function.
  *      Only use urbs in write urb pool that were successfully allocated.
@@ -568,6 +568,7 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) },
        { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
+       { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
        { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
                .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk },
        { },                                    /* Optional parameter entry */
@@ -1070,7 +1071,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a
                             (char*) &latency, 1, WDR_TIMEOUT);
 
        if (rv < 0) {
-               dev_err(dev, "Unable to read latency timer: %i", rv);
+               dev_err(dev, "Unable to read latency timer: %i\n", rv);
                return -EIO;
        }
        return sprintf(buf, "%i\n", latency);
@@ -1097,7 +1098,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute *
                             buf, 0, WDR_TIMEOUT);
 
        if (rv < 0) {
-               dev_err(dev, "Unable to write latency timer: %i", rv);
+               dev_err(dev, "Unable to write latency timer: %i\n", rv);
                return -EIO;
        }
 
@@ -1168,7 +1169,9 @@ static void remove_sysfs_attrs(struct usb_serial_port *port)
        /* XXX see create_sysfs_attrs */
        if (priv->chip_type != SIO) {
                device_remove_file(&port->dev, &dev_attr_event_char);
-               if (priv->chip_type == FT232BM || priv->chip_type == FT2232C) {
+               if (priv->chip_type == FT232BM ||
+                   priv->chip_type == FT2232C ||
+                   priv->chip_type == FT232RL) {
                        device_remove_file(&port->dev, &dev_attr_latency_timer);
                }
        }
@@ -2101,6 +2104,7 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
        case FT8U232AM:
        case FT232BM:
        case FT2232C:
+       case FT232RL:
                /* the 8U232AM returns a two byte value (the sio is a 1 byte value) - in the same
                   format as the data returned from the in point */
                if ((ret = usb_control_msg(port->serial->dev,