Commit 616b859f authored by Jody McIntyre's avatar Jody McIntyre Committed by Linus Torvalds

[PATCH] ieee1394: remove NULL checks for kfree

This patch removes redundant NULL pointer checks before kfree() in all of
drivers/ieee1394/
Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarJody McIntyre <scjody@steamballoon.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ac485dc
...@@ -1005,8 +1005,7 @@ static struct unit_directory *nodemgr_process_unit_directory ...@@ -1005,8 +1005,7 @@ static struct unit_directory *nodemgr_process_unit_directory
return ud; return ud;
unit_directory_error: unit_directory_error:
if (ud != NULL) kfree(ud);
kfree(ud);
return NULL; return NULL;
} }
......
...@@ -2931,7 +2931,7 @@ static void free_dma_rcv_ctx(struct dma_rcv_ctx *d) ...@@ -2931,7 +2931,7 @@ static void free_dma_rcv_ctx(struct dma_rcv_ctx *d)
kfree(d->prg_cpu); kfree(d->prg_cpu);
kfree(d->prg_bus); kfree(d->prg_bus);
} }
if (d->spb) kfree(d->spb); kfree(d->spb);
/* Mark this context as freed. */ /* Mark this context as freed. */
d->ohci = NULL; d->ohci = NULL;
......
...@@ -180,23 +180,13 @@ static int free_dma_iso_ctx(struct dma_iso_ctx *d) ...@@ -180,23 +180,13 @@ static int free_dma_iso_ctx(struct dma_iso_ctx *d)
kfree(d->prg_reg); kfree(d->prg_reg);
} }
if (d->ir_prg) kfree(d->ir_prg);
kfree(d->ir_prg); kfree(d->it_prg);
kfree(d->buffer_status);
if (d->it_prg) kfree(d->buffer_time);
kfree(d->it_prg); kfree(d->last_used_cmd);
kfree(d->next_buffer);
if (d->buffer_status)
kfree(d->buffer_status);
if (d->buffer_time)
kfree(d->buffer_time);
if (d->last_used_cmd)
kfree(d->last_used_cmd);
if (d->next_buffer)
kfree(d->next_buffer);
list_del(&d->link); list_del(&d->link);
kfree(d); kfree(d);
return 0; return 0;
...@@ -1060,8 +1050,7 @@ static int __video1394_ioctl(struct file *file, ...@@ -1060,8 +1050,7 @@ static int __video1394_ioctl(struct file *file,
PRINT(KERN_ERR, ohci->host->id, PRINT(KERN_ERR, ohci->host->id,
"Buffer %d is already used",v.buffer); "Buffer %d is already used",v.buffer);
spin_unlock_irqrestore(&d->lock,flags); spin_unlock_irqrestore(&d->lock,flags);
if (psizes) kfree(psizes);
kfree(psizes);
return -EBUSY; return -EBUSY;
} }
...@@ -1116,9 +1105,7 @@ static int __video1394_ioctl(struct file *file, ...@@ -1116,9 +1105,7 @@ static int __video1394_ioctl(struct file *file,
} }
} }
if (psizes) kfree(psizes);
kfree(psizes);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment