diff --git a/[refs] b/[refs] index 5008bab39442..21179050480b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62522d36d74a843e78d17f2dffc90468c6762803 +refs/heads/master: fc0ba8e87189b02683177116932fa580ab97b7ff diff --git a/trunk/drivers/net/enic/vnic_vic.c b/trunk/drivers/net/enic/vnic_vic.c index d769772998c6..0a35085004d0 100644 --- a/trunk/drivers/net/enic/vnic_vic.c +++ b/trunk/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));