diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2009-02-06 23:47:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-06 23:47:14 -0800 |
| commit | 910d30b704542b49f83881a4832d8414c6c3d9c3 (patch) | |
| tree | 3973f0a9b850dc82158c9bf3c310c34ba2dacda7 | |
| parent | 69ebbf58f3dff9fb4e5240e472b5869fa869dae1 (diff) | |
| download | linux-910d30b704542b49f83881a4832d8414c6c3d9c3.tar.bz2 | |
ax25: more common return path joining
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ax25/ax25_iface.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c index 8443af57a374..71338f112108 100644 --- a/net/ax25/ax25_iface.c +++ b/net/ax25/ax25_iface.c @@ -61,27 +61,24 @@ void ax25_protocol_release(unsigned int pid) write_lock_bh(&protocol_list_lock); protocol = protocol_list; - if (protocol == NULL) { - write_unlock_bh(&protocol_list_lock); - return; - } + if (protocol == NULL) + goto out; if (protocol->pid == pid) { protocol_list = protocol->next; - write_unlock_bh(&protocol_list_lock); - return; + goto out; } while (protocol != NULL && protocol->next != NULL) { if (protocol->next->pid == pid) { s = protocol->next; protocol->next = protocol->next->next; - write_unlock_bh(&protocol_list_lock); - return; + goto out; } protocol = protocol->next; } +out: write_unlock_bh(&protocol_list_lock); } |