diff options
| author |   Jesper Juhl <juhl-lkml@dif.dk> | 2005-04-18 17:39:34 -0700 |
|---|---|---|
| committer |   Greg K-H <gregkh@suse.de> | 2005-04-18 17:39:34 -0700 |
| commit | 1bc3c9e1e44c2059fe2ffa6ff70ad0a925d7b05f (patch) | |
| tree | 0bc14ec53acf3b4c08a9995c7ea335e236435558 /drivers/usb/serial/ftdi_sio.c | |
| parent | [PATCH] usb: kfree() cleanups in drivers/usb/core/devio.c (diff) | |
| download | linux-dev-1bc3c9e1e44c2059fe2ffa6ff70ad0a925d7b05f.tar.xz linux-dev-1bc3c9e1e44c2059fe2ffa6ff70ad0a925d7b05f.zip | |
[PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL
Get rid of a bunch of redundant NULL pointer checks in drivers/usb/*,
there's no need to check a pointer for NULL before calling kfree() on it.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Index: gregkh-2.6/drivers/usb/class/audio.c
===================================================================
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 4afd905fe2fe..4c788c767a97 100644 --- 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); |