Commit fc0ba8e8 authored Jun 09, 2010 by Dan Carpenter Committed by David S. Miller Jun 11, 2010

enic: cleanup vic_provinfo_alloc()



If oui were a null variable then vic_provinfo_alloc() would leak memory.
But this function is only called from one place and oui is not null so
I removed the check.

I also moved the memory allocation down a line so it was easier to spot.
(No one ever reads variable declarations).

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 62522d36

drivers/net/enic/vnic_vic.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -25,9 +25,10 @@

		struct vic_provinfo vic_provinfo_alloc(gfp_t flags, u8 oui, u8 type)
		{
		struct vic_provinfo *vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
		struct vic_provinfo *vp;

		if (!vp \|\| !oui)
		vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
		if (!vp)
		return NULL;

		memcpy(vp->oui, oui, sizeof(vp->oui));