Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / usb / serial / kl5kusb105.c

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 49c602a0b4dfc1399b9f062474bb4457b2a4ad05..a11e829e38c8a04e8c90b1d3fa8f262176a4b41e 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -341,8 +341,7 @@ static void klsi_105_shutdown (struct usb_serial *serial)
                                         * finished.  Otherwise this call
                                         * oopses. */
                                        /* usb_kill_urb(write_urbs[j]); */
-                                       if (write_urbs[j]->transfer_buffer)
-                                                   kfree(write_urbs[j]->transfer_buffer);
+                                       kfree(write_urbs[j]->transfer_buffer);
                                        usb_free_urb (write_urbs[j]);
                                }
                        }