diff options
| author |   Dan Carpenter <error27@gmail.com> | 2010-06-09 21:59:03 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-11 18:37:07 -0700 |
| commit | fc0ba8e87189b02683177116932fa580ab97b7ff (patch) | |
| tree | ba9bac6b668cf6e5bbb2d1a55767302397641471 /drivers/net/enic | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-fc0ba8e87189b02683177116932fa580ab97b7ff.tar.xz linux-dev-fc0ba8e87189b02683177116932fa580ab97b7ff.zip | |
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>
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/vnic_vic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c index d769772998c6..0a35085004d0 100644 --- a/drivers/net/enic/vnic_vic.c +++ b/drivers/net/enic/vnic_vic.c @@ -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)); |