From: Huaxu Wan <huaxu.wan@linux.intel.com>
To: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error
Date: Fri, 25 Dec 2009 17:22:25 +0800 [thread overview]
Message-ID: <20091225092225.GA11049@owl> (raw)
Compat-wireless-2.6: Updated to fix bluetooth patch error
Keep the patch in step with the linux-next tree after the following
patch merged.
commit 971beb83aeb2a309175682cf5683d64fd4591841
Author: Roel Kluin <roel.kluin@gmail.com>
Date: Mon Dec 7 14:23:21 2009 +0100
Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()
Return the PTR_ERR of the correct pointer.
Signed-off-by: Huaxu Wan <huaxu.wan@linux.intel.com>
---
patches/16-bluetooth.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 7382856..3a79f84 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -200,7 +200,7 @@ diff -Nur a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
hid = hid_allocate_device();
if (IS_ERR(hid))
- return PTR_ERR(session->hid);
+ return PTR_ERR(hid);
+#endif
session->hid = hid;
--
1.6.3.3
next reply other threads:[~2009-12-25 9:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-25 9:22 Huaxu Wan [this message]
2009-12-29 2:00 ` [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091225092225.GA11049@owl \
--to=huaxu.wan@linux.intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=lrodriguez@atheros.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).