From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sun, 30 Nov 2008 11:17:18 +0000 (+0100)
Subject: Bluetooth: Fix TX error path in btsdio driver
X-Git-Tag: v2.6.27.19~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0338cfe915f96ff15f1c2902ee19f9ee3c41478d;p=thirdparty%2Fkernel%2Fstable.git

Bluetooth: Fix TX error path in btsdio driver

commit 7644d63d1348ec044ccd8f775fefe5eb7cbcac69 upstream.

This patch fixes accumulating of the header in case packet was requeued
in the error path.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 58630cc1eff2f..c422e897c3b18 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -91,6 +91,7 @@ static int btsdio_tx_packet(struct btsdio_data *data, struct sk_buff *skb)
 
 	err = sdio_writesb(data->func, REG_TDAT, skb->data, skb->len);
 	if (err < 0) {
+		skb_pull(skb, 4);
 		sdio_writeb(data->func, 0x01, REG_PC_WRT, NULL);
 		return err;
 	}