Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202904
b: refs/heads/master
c: fc0ba8e
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jun 12, 2010
1 parent c90f17c commit 249b612
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62522d36d74a843e78d17f2dffc90468c6762803
refs/heads/master: fc0ba8e87189b02683177116932fa580ab97b7ff
5 changes: 3 additions & 2 deletions trunk/drivers/net/enic/vnic_vic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 249b612

Please sign in to comment.