vserver 2.0 rc7

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

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index b9846a5..ebf9967 100644 (file)
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -273,7 +273,7 @@ static int TIReadVendorRequestSync (struct usb_device *dev,
                                index,
                                data,
                                size,
-                               HZ);
+                               1000);
        if (status < 0)
                return status;
        if (status != size) {
@@ -303,8 +303,7 @@ static int TISendVendorRequestSync (struct usb_device *dev,
                                index,
                                data,
                                size,
-                               HZ);
-
+                               1000);
        if (status < 0)
                return status;
        if (status != size) {
@@ -985,7 +984,7 @@ static int TISendBulkTransferSync (struct usb_serial *serial, void *buffer, int
                                buffer,
                                length,
                                num_sent,
-                               HZ);
+                               1000);
        return status;
 }
 
@@ -2846,9 +2845,8 @@ static struct edge_buf *edge_buf_alloc(unsigned int size)
 
 void edge_buf_free(struct edge_buf *eb)
 {
-       if (eb != NULL) {
-               if (eb->buf_buf != NULL)
-                       kfree(eb->buf_buf);
+       if (eb) {
+               kfree(eb->buf_buf);
                kfree(eb);
        }
 }