diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 10:39:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 10:39:27 -0400 |
| commit | d3641409a05dcb8e28116bb2ad638f5a42805d9d (patch) | |
| tree | 1d43a5e0129709502edb631a4fd66de369ee5620 /net/bluetooth/sco.c | |
| parent | 953c96e0d85615d1ab1f100e525d376053294dc2 (diff) | |
| parent | 6fe5468f452c0c40348ebd4e737758a842286ca8 (diff) | |
| download | lwn-d3641409a05dcb8e28116bb2ad638f5a42805d9d.tar.gz lwn-d3641409a05dcb8e28116bb2ad638f5a42805d9d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index fb6192c9812e..2c8055350510 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -1113,8 +1113,7 @@ void __exit sco_exit(void) debugfs_remove(sco_debugfs); - if (bt_sock_unregister(BTPROTO_SCO) < 0) - BT_ERR("SCO socket unregistration failed"); + bt_sock_unregister(BTPROTO_SCO); proto_unregister(&sco_proto); } |