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/irda/discovery.c | |
| 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/irda/discovery.c')
| -rw-r--r-- | net/irda/discovery.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/irda/discovery.c b/net/irda/discovery.c index c4ba5fa1446a..3fefc822c1c0 100644 --- a/net/irda/discovery.c +++ b/net/irda/discovery.c | |||
| @@ -194,8 +194,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force) | |||
| 194 | 194 | ||
| 195 | /* Remove it from the log */ | 195 | /* Remove it from the log */ |
| 196 | curr = hashbin_remove_this(log, (irda_queue_t *) curr); | 196 | curr = hashbin_remove_this(log, (irda_queue_t *) curr); |
| 197 | if (curr) | 197 | kfree(curr); |
| 198 | kfree(curr); | ||
| 199 | } | 198 | } |
| 200 | } | 199 | } |
| 201 | 200 | ||