diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /drivers/net/bsd_comp.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'drivers/net/bsd_comp.c')
| -rw-r--r-- | drivers/net/bsd_comp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c index 88edb986691a..6e99d80ec409 100644 --- a/drivers/net/bsd_comp.c +++ b/drivers/net/bsd_comp.c | |||
| @@ -429,7 +429,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp) | |||
| 429 | if (!db->lens) | 429 | if (!db->lens) |
| 430 | { | 430 | { |
| 431 | bsd_free (db); | 431 | bsd_free (db); |
| 432 | return (NULL); | 432 | return NULL; |
| 433 | } | 433 | } |
| 434 | } | 434 | } |
| 435 | /* | 435 | /* |