From 0605d2297ade85e23dee985e8dce15517b65f397 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sun, 19 Feb 2012 14:06:48 +0200 Subject: [PATCH] --- yaml --- r: 290981 b: refs/heads/master c: 48c7aba91f372251867d15efc9cf694ceee2de02 h: refs/heads/master i: 290979: 74876dad48df74a7a354b99e1891b805090a11c9 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_conn.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 17aa035ec08a..c098857358d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2da9c55c5a4a0b8f0348b7acd70d8b08a6ae4573 +refs/heads/master: 48c7aba91f372251867d15efc9cf694ceee2de02 diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c index 7ee6895c4b0c..8549d04e3313 100644 --- a/trunk/net/bluetooth/hci_conn.c +++ b/trunk/net/bluetooth/hci_conn.c @@ -551,7 +551,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 if (!acl) { acl = hci_conn_add(hdev, ACL_LINK, dst); if (!acl) - return NULL; + return ERR_PTR(-ENOMEM); } hci_conn_hold(acl); @@ -571,7 +571,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sco = hci_conn_add(hdev, type, dst); if (!sco) { hci_conn_put(acl); - return NULL; + return ERR_PTR(-ENOMEM); } }