fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / usb / serial / ezusb.c

diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c
index 676d965..97ee718 100644 (file)
--- a/drivers/usb/serial/ezusb.c
+++ b/drivers/usb/serial/ezusb.c
@@ -8,7 +8,6 @@
  *     2 as published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -16,14 +15,7 @@
 #include <linux/tty.h>
 #include <linux/module.h>
 #include <linux/usb.h>
-
-#ifdef CONFIG_USB_SERIAL_DEBUG
-       static int debug = 1;
-#else
-       static int debug;
-#endif
-
-#include "usb-serial.h"
+#include <linux/usb/serial.h>
 
 /* EZ-USB Control and Status Register.  Bit 0 controls 8051 reset */
 #define CPUCS_REG    0x7F92
@@ -35,29 +27,28 @@ int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da
 
        /* dbg("ezusb_writememory %x, %d", address, length); */
        if (!serial->dev) {
-               dbg("%s - no physical device present, failing.", __FUNCTION__);
+               err("%s - no physical device present, failing.", __FUNCTION__);
                return -ENODEV;
        }
 
-       transfer_buffer =  kmalloc (length, GFP_KERNEL);
+       transfer_buffer = kmemdup(data, length, GFP_KERNEL);
        if (!transfer_buffer) {
                dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, length);
                return -ENOMEM;
        }
-       memcpy (transfer_buffer, data, length);
-       result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3*HZ);
+       result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000);
        kfree (transfer_buffer);
        return result;
 }
 
 int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit)
 {
-       int     response;
-       dbg("%s - %d", __FUNCTION__, reset_bit);
+       int response;
+
+       /* dbg("%s - %d", __FUNCTION__, reset_bit); */
        response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0);
-       if (response < 0) {
+       if (response < 0)
                dev_err(&serial->dev->dev, "%s- %d failed\n", __FUNCTION__, reset_bit);
-       }
        return response;
 }