Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / net / bluetooth / hidp / core.c

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 3c036b0..5ec1297 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -158,7 +158,8 @@ static int hidp_queue_event(struct hidp_session *session, struct input_dev *dev,
 
        session->leds = newleds;
 
-       if (!(skb = alloc_skb(3, GFP_ATOMIC))) {
+       skb = alloc_skb(3, GFP_ATOMIC);
+       if (!skb) {
                BT_ERR("Can't allocate memory for new frame");
                return -ENOMEM;
        }
@@ -251,7 +252,8 @@ static int __hidp_send_ctrl_message(struct hidp_session *session,
 
        BT_DBG("session %p data %p size %d", session, data, size);
 
-       if (!(skb = alloc_skb(size + 1, GFP_ATOMIC))) {
+       skb = alloc_skb(size + 1, GFP_ATOMIC);
+       if (!skb) {
                BT_ERR("Can't allocate memory for new frame");
                return -ENOMEM;
        }
@@ -284,7 +286,8 @@ static int hidp_queue_report(struct hidp_session *session,
 
        BT_DBG("session %p hid %p data %p size %d", session, session->hid, data, size);
 
-       if (!(skb = alloc_skb(size + 1, GFP_ATOMIC))) {
+       skb = alloc_skb(size + 1, GFP_ATOMIC);
+       if (!skb) {
                BT_ERR("Can't allocate memory for new frame");
                return -ENOMEM;
        }
@@ -1181,8 +1184,6 @@ static int __init hidp_init(void)
 {
        int ret;
 
-       l2cap_load();
-
        BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
 
        ret = hid_register_driver(&hidp_driver);