diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /net/bluetooth/bnep | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'net/bluetooth/bnep')
-rw-r--r-- | net/bluetooth/bnep/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 29b1b220d6cf..ef09c7b3a858 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
@@ -78,7 +78,7 @@ static struct bnep_session *__bnep_get_session(u8 *dst) | |||
78 | static void __bnep_link_session(struct bnep_session *s) | 78 | static void __bnep_link_session(struct bnep_session *s) |
79 | { | 79 | { |
80 | /* It's safe to call __module_get() here because sessions are added | 80 | /* It's safe to call __module_get() here because sessions are added |
81 | by the socket layer which has to hold the refference to this module. | 81 | by the socket layer which has to hold the reference to this module. |
82 | */ | 82 | */ |
83 | __module_get(THIS_MODULE); | 83 | __module_get(THIS_MODULE); |
84 | list_add(&s->list, &bnep_session_list); | 84 | list_add(&s->list, &bnep_session_list); |
@@ -632,7 +632,7 @@ int bnep_del_connection(struct bnep_conndel_req *req) | |||
632 | s = __bnep_get_session(req->dst); | 632 | s = __bnep_get_session(req->dst); |
633 | if (s) { | 633 | if (s) { |
634 | /* Wakeup user-space which is polling for socket errors. | 634 | /* Wakeup user-space which is polling for socket errors. |
635 | * This is temporary hack untill we have shutdown in L2CAP */ | 635 | * This is temporary hack until we have shutdown in L2CAP */ |
636 | s->sock->sk->sk_err = EUNATCH; | 636 | s->sock->sk->sk_err = EUNATCH; |
637 | 637 | ||
638 | /* Kill session thread */ | 638 | /* Kill session thread */ |