diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /net/802 | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'net/802')
| -rw-r--r-- | net/802/p8023.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/802/p8023.c b/net/802/p8023.c index 6368d3dce444..d23e906456eb 100644 --- a/net/802/p8023.c +++ b/net/802/p8023.c | |||
| @@ -54,8 +54,7 @@ struct datalink_proto *make_8023_client(void) | |||
| 54 | */ | 54 | */ |
| 55 | void destroy_8023_client(struct datalink_proto *dl) | 55 | void destroy_8023_client(struct datalink_proto *dl) |
| 56 | { | 56 | { |
| 57 | if (dl) | 57 | kfree(dl); |
| 58 | kfree(dl); | ||
| 59 | } | 58 | } |
| 60 | 59 | ||
| 61 | EXPORT_SYMBOL(destroy_8023_client); | 60 | EXPORT_SYMBOL(destroy_8023_client); |