diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:31:43 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:31:43 -0400 |
| commit | a42c74ee608a424342ef7069ccddf196d873040c (patch) | |
| tree | 75adfb9f5e06ebb7c7d5d5e5a5408fa0d6d504b9 /net/bluetooth/bnep/sock.c | |
| parent | 97990a060e6757f48b931a3946b17c1c4362c3fb (diff) | |
| parent | 9b383672452bb1097124c76fcb4903e0021f6baf (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/bluetooth/bnep/sock.c')
| -rw-r--r-- | net/bluetooth/bnep/sock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c index e7154a58465f..5b1c04e28821 100644 --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c | |||
| @@ -253,8 +253,6 @@ error: | |||
| 253 | void __exit bnep_sock_cleanup(void) | 253 | void __exit bnep_sock_cleanup(void) |
| 254 | { | 254 | { |
| 255 | bt_procfs_cleanup(&init_net, "bnep"); | 255 | bt_procfs_cleanup(&init_net, "bnep"); |
| 256 | if (bt_sock_unregister(BTPROTO_BNEP) < 0) | 256 | bt_sock_unregister(BTPROTO_BNEP); |
| 257 | BT_ERR("Can't unregister BNEP socket"); | ||
| 258 | |||
| 259 | proto_unregister(&bnep_proto); | 257 | proto_unregister(&bnep_proto); |
| 260 | } | 258 | } |