Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/ieee1394/nodemgr.c

+1 −2
Original line number Diff line number Diff line
@@ -1005,7 +1005,6 @@ static struct unit_directory *nodemgr_process_unit_directory 
	return ud;



unit_directory_error:

	if (ud != NULL)

	kfree(ud);

	return NULL;

}

drivers/ieee1394/ohci1394.c

+1 −1
Original line number Diff line number Diff line
@@ -2931,7 +2931,7 @@ static void free_dma_rcv_ctx(struct dma_rcv_ctx *d) 
		kfree(d->prg_cpu);

		kfree(d->prg_bus);

	}

	if (d->spb) kfree(d->spb);

	kfree(d->spb);



	/* Mark this context as freed. */

	d->ohci = NULL;

drivers/ieee1394/video1394.c

+8 −21
Original line number Diff line number Diff line
@@ -180,23 +180,13 @@ static int free_dma_iso_ctx(struct dma_iso_ctx *d) 
		kfree(d->prg_reg);

	}



	if (d->ir_prg)

	kfree(d->ir_prg);



	if (d->it_prg)

	kfree(d->it_prg);



	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);



	kfree(d);



	return 0;
@@ -1060,7 +1050,6 @@ static int __video1394_ioctl(struct file *file, 
			PRINT(KERN_ERR, ohci->host->id,

			      "Buffer %d is already used",v.buffer);

			spin_unlock_irqrestore(&d->lock,flags);

			if (psizes)

			kfree(psizes);

			return -EBUSY;

		}
@@ -1116,9 +1105,7 @@ static int __video1394_ioctl(struct file *file, 
			}

		}



		if (psizes)

		kfree(psizes);



		return 0;



	}