[PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / ftdi_sio.c

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 4afd905fe2fe429ffcb766678a68e212c925dc5a..4c788c767a97f890df4f24741f4d47518bc1a6ee 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1347,9 +1347,7 @@ static int ftdi_common_startup (struct usb_serial *serial)
        priv->flags = ASYNC_LOW_LATENCY;
 
        /* Increase the size of read buffers */
-       if (port->bulk_in_buffer) {
-               kfree (port->bulk_in_buffer);
-       }
+       kfree(port->bulk_in_buffer);
        port->bulk_in_buffer = kmalloc (BUFSZ, GFP_KERNEL);
        if (!port->bulk_in_buffer) {
                kfree (priv);
@@ -1365,10 +1363,8 @@ static int ftdi_common_startup (struct usb_serial *serial)
                usb_free_urb (port->write_urb);
                port->write_urb = NULL;
        }
-       if (port->bulk_out_buffer) {
-               kfree (port->bulk_out_buffer);
-               port->bulk_out_buffer = NULL;
-       }
+       kfree(port->bulk_out_buffer);
+       port->bulk_out_buffer = NULL;
 
        usb_set_serial_port_data(serial->port[0], priv);