Skip to content

Commit

Permalink
[PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL
Browse files Browse the repository at this point in the history 
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
===================================================================
  • Loading branch information
Jesper Juhl authored and Greg K-H committed Apr 19, 2005
1 parent 6fd19f4 commit 1bc3c9e
Show file tree
Hide file tree
Showing 26 changed files with 91 additions and 166 deletions.
48 changes: 16 additions & 32 deletions drivers/usb/class/audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,14 +649,10 @@ static void usbin_stop(struct usb_audiodev *as)
}
}
set_current_state(TASK_RUNNING);
if (u->durb[0].urb->transfer_buffer)
kfree(u->durb[0].urb->transfer_buffer);
if (u->durb[1].urb->transfer_buffer)
kfree(u->durb[1].urb->transfer_buffer);
if (u->surb[0].urb->transfer_buffer)
kfree(u->surb[0].urb->transfer_buffer);
if (u->surb[1].urb->transfer_buffer)
kfree(u->surb[1].urb->transfer_buffer);
kfree(u->durb[0].urb->transfer_buffer);
kfree(u->durb[1].urb->transfer_buffer);
kfree(u->surb[0].urb->transfer_buffer);
kfree(u->surb[1].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = u->durb[1].urb->transfer_buffer =
u->surb[0].urb->transfer_buffer = u->surb[1].urb->transfer_buffer = NULL;
}
Expand Down Expand Up @@ -1009,21 +1005,17 @@ static int usbin_start(struct usb_audiodev *as)
u->phase = 0;
maxsze = (u->freqmax + 0x3fff) >> (14 - AFMT_BYTESSHIFT(u->format));
bufsz = DESCFRAMES * maxsze;
if (u->durb[0].urb->transfer_buffer)
kfree(u->durb[0].urb->transfer_buffer);
kfree(u->durb[0].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[0].urb->transfer_buffer_length = bufsz;
if (u->durb[1].urb->transfer_buffer)
kfree(u->durb[1].urb->transfer_buffer);
kfree(u->durb[1].urb->transfer_buffer);
u->durb[1].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[1].urb->transfer_buffer_length = bufsz;
if (u->syncpipe) {
if (u->surb[0].urb->transfer_buffer)
kfree(u->surb[0].urb->transfer_buffer);
kfree(u->surb[0].urb->transfer_buffer);
u->surb[0].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[0].urb->transfer_buffer_length = 3*SYNCFRAMES;
if (u->surb[1].urb->transfer_buffer)
kfree(u->surb[1].urb->transfer_buffer);
kfree(u->surb[1].urb->transfer_buffer);
u->surb[1].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[1].urb->transfer_buffer_length = 3*SYNCFRAMES;
}
Expand Down Expand Up @@ -1128,14 +1120,10 @@ static void usbout_stop(struct usb_audiodev *as)
}
}
set_current_state(TASK_RUNNING);
if (u->durb[0].urb->transfer_buffer)
kfree(u->durb[0].urb->transfer_buffer);
if (u->durb[1].urb->transfer_buffer)
kfree(u->durb[1].urb->transfer_buffer);
if (u->surb[0].urb->transfer_buffer)
kfree(u->surb[0].urb->transfer_buffer);
if (u->surb[1].urb->transfer_buffer)
kfree(u->surb[1].urb->transfer_buffer);
kfree(u->durb[0].urb->transfer_buffer);
kfree(u->durb[1].urb->transfer_buffer);
kfree(u->surb[0].urb->transfer_buffer);
kfree(u->surb[1].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = u->durb[1].urb->transfer_buffer =
u->surb[0].urb->transfer_buffer = u->surb[1].urb->transfer_buffer = NULL;
}
Expand Down Expand Up @@ -1376,21 +1364,17 @@ static int usbout_start(struct usb_audiodev *as)
u->phase = 0;
maxsze = (u->freqmax + 0x3fff) >> (14 - AFMT_BYTESSHIFT(u->format));
bufsz = DESCFRAMES * maxsze;
if (u->durb[0].urb->transfer_buffer)
kfree(u->durb[0].urb->transfer_buffer);
kfree(u->durb[0].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[0].urb->transfer_buffer_length = bufsz;
if (u->durb[1].urb->transfer_buffer)
kfree(u->durb[1].urb->transfer_buffer);
kfree(u->durb[1].urb->transfer_buffer);
u->durb[1].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[1].urb->transfer_buffer_length = bufsz;
if (u->syncpipe) {
if (u->surb[0].urb->transfer_buffer)
kfree(u->surb[0].urb->transfer_buffer);
kfree(u->surb[0].urb->transfer_buffer);
u->surb[0].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[0].urb->transfer_buffer_length = 3*SYNCFRAMES;
if (u->surb[1].urb->transfer_buffer)
kfree(u->surb[1].urb->transfer_buffer);
kfree(u->surb[1].urb->transfer_buffer);
u->surb[1].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[1].urb->transfer_buffer_length = 3*SYNCFRAMES;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/class/bluetty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static int bluetooth_ctrl_msg (struct usb_bluetooth *bluetooth, int request, int
}
}
if (urb->transfer_buffer_length < len) {
kfree (urb->transfer_buffer);
kfree(urb->transfer_buffer);
urb->transfer_buffer = kmalloc (len, GFP_KERNEL);
if (urb->transfer_buffer == NULL) {
err ("%s - out of memory", __FUNCTION__);
Expand Down Expand Up @@ -535,7 +535,7 @@ static int bluetooth_write (struct tty_struct * tty, const unsigned char *buf, i
}

exit:
kfree (temp_buffer);
kfree(temp_buffer);

return retval;
}
Expand Down
7 changes: 2 additions & 5 deletions drivers/usb/core/devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,8 @@ static int usb_device_open(struct inode *inode, struct file *file)

static int usb_device_release(struct inode *inode, struct file *file)
{
if (file->private_data) {
kfree(file->private_data);
file->private_data = NULL;
}

kfree(file->private_data);
file->private_data = NULL;
return 0;
}

Expand Down
16 changes: 6 additions & 10 deletions drivers/usb/core/hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ static void hub_tt_kevent (void *arg)
dev_err (&hdev->dev,
"clear tt %d (%04x) error %d\n",
clear->tt, clear->devinfo, status);
kfree (clear);
kfree(clear);
}
spin_unlock_irqrestore (&hub->tt.lock, flags);
}
Expand Down Expand Up @@ -728,15 +728,11 @@ static void hub_disconnect(struct usb_interface *intf)
list_del_init(&hub->event_list);
spin_unlock_irq(&hub_event_lock);

if (hub->descriptor) {
kfree(hub->descriptor);
hub->descriptor = NULL;
}
kfree(hub->descriptor);
hub->descriptor = NULL;

if (hub->status) {
kfree(hub->status);
hub->status = NULL;
}
kfree(hub->status);
hub->status = NULL;

if (hub->buffer) {
usb_buffer_free(hdev, sizeof(*hub->buffer), hub->buffer,
Expand Down Expand Up @@ -2354,7 +2350,7 @@ check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port1)
schedule_work (&hub->leds);
}
}
kfree (qual);
kfree(qual);
}

static unsigned
Expand Down
5 changes: 2 additions & 3 deletions drivers/usb/gadget/serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2312,9 +2312,8 @@ static struct gs_buf *gs_buf_alloc(unsigned int size, int kmalloc_flags)
*/
void gs_buf_free(struct gs_buf *gb)
{
if (gb != NULL) {
if (gb->buf_buf != NULL)
kfree(gb->buf_buf);
if (gb) {
kfree(gb->buf_buf);
kfree(gb);
}
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/host/ehci-mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
ehci->periodic = NULL;

/* shadow periodic table */
if (ehci->pshadow)
kfree (ehci->pshadow);
kfree(ehci->pshadow);
ehci->pshadow = NULL;
}

Expand Down
7 changes: 2 additions & 5 deletions drivers/usb/host/uhci-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,8 +890,7 @@ static int __init uhci_hcd_init(void)
debugfs_remove(uhci_debugfs_root);

debug_failed:
if (errbuf)
kfree(errbuf);
kfree(errbuf);

errbuf_failed:

Expand All @@ -906,9 +905,7 @@ static void __exit uhci_hcd_cleanup(void)
warn("not all urb_priv's were freed!");

debugfs_remove(uhci_debugfs_root);

if (errbuf)
kfree(errbuf);
kfree(errbuf);
}

module_init(uhci_hcd_init);
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/input/hid-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,8 +558,7 @@ static void hid_free_device(struct hid_device *device)
}
}

if (device->rdesc)
kfree(device->rdesc);
kfree(device->rdesc);
kfree(device);
}

Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/media/dabusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ static int dabusb_free_queue (struct list_head *q)
#ifdef DEBUG
dump_urb(b->purb);
#endif
if (b->purb->transfer_buffer)
kfree (b->purb->transfer_buffer);
kfree(b->purb->transfer_buffer);
usb_free_urb(b->purb);
tmp = p->next;
list_del (p);
Expand Down
12 changes: 4 additions & 8 deletions drivers/usb/media/ov511.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3915,10 +3915,8 @@ ov51x_do_dealloc(struct usb_ov511 *ov)
ov->tempfbuf = NULL;

for (i = 0; i < OV511_NUMSBUF; i++) {
if (ov->sbuf[i].data) {
kfree(ov->sbuf[i].data);
ov->sbuf[i].data = NULL;
}
kfree(ov->sbuf[i].data);
ov->sbuf[i].data = NULL;
}

for (i = 0; i < OV511_NUMFRAMES; i++) {
Expand Down Expand Up @@ -5954,10 +5952,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
up(&ov->cbuf_lock);
}

if (ov) {
kfree(ov);
ov = NULL;
}
kfree(ov);
ov = NULL;

error_out:
err("Camera initialization failed");
Expand Down
15 changes: 8 additions & 7 deletions drivers/usb/media/se401.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,13 +868,14 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401)

se401->dev = NULL;

for (i=0; i<SE401_NUMSBUF; i++) if (se401->urb[i]) {
usb_kill_urb(se401->urb[i]);
usb_free_urb(se401->urb[i]);
se401->urb[i] = NULL;
kfree(se401->sbuf[i].data);
}
for (i=0; i<SE401_NUMSCRATCH; i++) if (se401->scratch[i].data) {
for (i=0; i<SE401_NUMSBUF; i++)
if (se401->urb[i]) {
usb_kill_urb(se401->urb[i]);
usb_free_urb(se401->urb[i]);
se401->urb[i] = NULL;
kfree(se401->sbuf[i].data);
}
for (i=0; i<SE401_NUMSCRATCH; i++) {
kfree(se401->scratch[i].data);
}
if (se401->inturb) {
Expand Down
6 changes: 2 additions & 4 deletions drivers/usb/media/usbvideo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1169,10 +1169,8 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
}
RingQueue_Free(&uvd->dp);
for (i=0; i < USBVIDEO_NUMSBUF; i++) {
if (uvd->sbuf[i].data != NULL) {
kfree (uvd->sbuf[i].data);
uvd->sbuf[i].data = NULL;
}
kfree(uvd->sbuf[i].data);
uvd->sbuf[i].data = NULL;
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions drivers/usb/media/w9968cf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3624,10 +3624,8 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
return 0;

fail: /* Free unused memory */
if (cam->control_buffer)
kfree(cam->control_buffer);
if (cam->data_buffer)
kfree(cam->data_buffer);
kfree(cam->control_buffer);
kfree(cam->data_buffer);
if (cam->v4ldev)
video_device_release(cam->v4ldev);
up(&cam->dev_sem);
Expand Down
26 changes: 10 additions & 16 deletions drivers/usb/misc/auerswald.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,16 +705,12 @@ static int auerchain_control_msg (pauerchain_t acp, struct usb_device *dev, unsi
/* free a single auerbuf */
static void auerbuf_free (pauerbuf_t bp)
{
if (bp->bufp) {
kfree (bp->bufp);
}
if (bp->dr) {
kfree (bp->dr);
}
kfree(bp->bufp);
kfree(bp->dr);
if (bp->urbp) {
usb_free_urb (bp->urbp);
usb_free_urb(bp->urbp);
}
kfree (bp);
kfree(bp);
}

/* free the buffers from an auerbuf list */
Expand Down Expand Up @@ -1093,14 +1089,12 @@ static void auerswald_int_complete (struct urb * urb, struct pt_regs *regs)
*/
static void auerswald_int_free (pauerswald_t cp)
{
if (cp->inturbp) {
usb_free_urb (cp->inturbp);
cp->inturbp = NULL;
}
if (cp->intbufp) {
kfree (cp->intbufp);
cp->intbufp = NULL;
}
if (cp->inturbp) {
usb_free_urb(cp->inturbp);
cp->inturbp = NULL;
}
kfree(cp->intbufp);
cp->intbufp = NULL;
}

/* This function is called to activate the interrupt
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/net/zd1201.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ int zd1201_fw_upload(struct usb_device *dev, int apfw)

err = 0;
exit:
if (buf)
kfree(buf);
kfree(buf);
release_firmware(fw_entry);
return err;
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/usb/serial/belkin_sa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@ static void belkin_sa_shutdown (struct usb_serial *serial)
for (i=0; i < serial->num_ports; ++i) {
/* My special items, the standard routines free my urbs */
priv = usb_get_serial_port_data(serial->port[i]);
if (priv)
kfree(priv);
kfree(priv);
}
}

Expand Down
5 changes: 2 additions & 3 deletions drivers/usb/serial/cypress_m8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1340,9 +1340,8 @@ static struct cypress_buf *cypress_buf_alloc(unsigned int size)

static void cypress_buf_free(struct cypress_buf *cb)
{
if (cb != NULL) {
if (cb->buf_buf != NULL)
kfree(cb->buf_buf);
if (cb) {
kfree(cb->buf_buf);
kfree(cb);
}
}
Expand Down
6 changes: 2 additions & 4 deletions drivers/usb/serial/empeg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,7 @@ static int __init empeg_init (void)
failed_usb_serial_register:
for (i = 0; i < NUM_URBS; ++i) {
if (write_urb_pool[i]) {
if (write_urb_pool[i]->transfer_buffer)
kfree(write_urb_pool[i]->transfer_buffer);
kfree(write_urb_pool[i]->transfer_buffer);
usb_free_urb(write_urb_pool[i]);
}
}
Expand All @@ -575,8 +574,7 @@ static void __exit empeg_exit (void)
* the host controllers get fixed to set urb->dev = NULL after
* the urb is finished. Otherwise this call oopses. */
/* usb_kill_urb(write_urb_pool[i]); */
if (write_urb_pool[i]->transfer_buffer)
kfree(write_urb_pool[i]->transfer_buffer);
kfree(write_urb_pool[i]->transfer_buffer);
usb_free_urb (write_urb_pool[i]);
}
}
Expand Down
Loading

0 comments on commit 1bc3c9e

Please sign in to comment.