[PATCH 5/5]bluetooth:hci_bcsp Fix operation on 'bcsp->msgq_txseq' may be undefined

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Justin P. Mattock
Date: Saturday, June 26, 2010 - 11:47 pm

Im seeing this building the kernel with gcc 4.6.0
 CC [M]  drivers/bluetooth/hci_bcsp.o
drivers/bluetooth/hci_bcsp.c: In function 'bcsp_prepare_pkt':
drivers/bluetooth/hci_bcsp.c:247:20: warning: operation on 'bcsp->msgq_txseq' may be undefined

Hopefully the below is a fix for this. Please let me know.
 Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>

---
 drivers/bluetooth/hci_bcsp.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 40aec0f..0f892e7 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -182,7 +182,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
 	struct sk_buff *nskb;
 	u8 hdr[4], chan;
 	u16 BCSP_CRC_INIT(bcsp_txmsg_crc);
-	int rel, i;
+	int rel, i, ret;
 
 	switch (pkt_type) {
 	case HCI_ACLDATA_PKT:
@@ -243,8 +243,8 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
 
 	if (rel) {
 		hdr[0] |= 0x80 + bcsp->msgq_txseq;
-		BT_DBG("Sending packet with seqno %u", bcsp->msgq_txseq);
-		bcsp->msgq_txseq = ++(bcsp->msgq_txseq) & 0x07;
+		BT_DBG("Sending packet with seqno %u", bcsp->msgq_txseq | ret);
+		ret = ++(bcsp->msgq_txseq) & 0x07;
 	}
 
 	if (bcsp->use_crc)
-- 
1.7.1.rc1.21.gf3bd6

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/5] Fix gcc 4.6.0 set but unused variable warnings , Justin P. Mattock, (Sat Jun 26, 11:47 pm)
[PATCH 1/5]security:key.c Fix warning: variable 'key' set ..., Justin P. Mattock, (Sat Jun 26, 11:47 pm)
[PATCH 2/5]security:ebitmap.c Fix warning: variable 'e_sft ..., Justin P. Mattock, (Sat Jun 26, 11:47 pm)
[PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set but ..., Justin P. Mattock, (Sat Jun 26, 11:47 pm)
[PATCH 4/5]block:cryptoloop Fix warning: variable 'cipher' ..., Justin P. Mattock, (Sat Jun 26, 11:47 pm)
[PATCH 5/5]bluetooth:hci_bcsp Fix operation on 'bcsp->msgq ..., Justin P. Mattock, (Sat Jun 26, 11:47 pm)
Re: [PATCH 5/5]bluetooth:hci_bcsp Fix operation on 'bcsp-&gt; ..., Gustavo F. Padovan, (Sun Jun 27, 12:31 am)
[PATCH] Bluetooth: Fix abuse of the preincrement operator, David Howells, (Mon Jun 28, 5:57 am)
Re: [PATCH] Bluetooth: Fix abuse of the preincrement operator, Gustavo F. Padovan, (Mon Jun 28, 6:12 am)
Re: [PATCH] Bluetooth: Fix abuse of the preincrement operator, Justin P. Mattock, (Mon Jun 28, 10:44 am)
Re: [PATCH 1/5]security:key.c Fix warning: variable 'key' ..., Justin P. Mattock, (Mon Jun 28, 10:48 am)
Re: [PATCH 2/5]security:ebitmap.c Fix warning: variable 'e ..., Justin P. Mattock, (Mon Jun 28, 10:49 am)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Mon Jun 28, 10:52 am)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Mon Jun 28, 12:03 pm)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Mon Jun 28, 12:08 pm)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Mon Jun 28, 8:23 pm)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Tue Jun 29, 10:14 am)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Tue Jun 29, 2:53 pm)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Wed Jun 30, 6:21 am)
Re: [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' set ..., Justin P. Mattock, (Wed Jun 30, 12:47 pm)