git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
bluetooth
/
hidp
/
core.c
diff --git
a/net/bluetooth/hidp/core.c
b/net/bluetooth/hidp/core.c
index
cdb9cfa
..
c6e3a2c
100644
(file)
--- a/
net/bluetooth/hidp/core.c
+++ b/
net/bluetooth/hidp/core.c
@@
-20,7
+20,6
@@
SOFTWARE IS DISCLAIMED.
*/
SOFTWARE IS DISCLAIMED.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-583,10
+582,9
@@
int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
bacmp(&bt_sk(ctrl_sock->sk)->dst, &bt_sk(intr_sock->sk)->dst))
return -ENOTUNIQ;
bacmp(&bt_sk(ctrl_sock->sk)->dst, &bt_sk(intr_sock->sk)->dst))
return -ENOTUNIQ;
- session = k
m
alloc(sizeof(struct hidp_session), GFP_KERNEL);
+ session = k
z
alloc(sizeof(struct hidp_session), GFP_KERNEL);
if (!session)
return -ENOMEM;
if (!session)
return -ENOMEM;
- memset(session, 0, sizeof(struct hidp_session));
session->input = input_allocate_device();
if (!session->input) {
session->input = input_allocate_device();
if (!session->input) {