From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tomas Winkler To: stable@kernel.org, marcel@holtmann.org Cc: linux-bluetooth@vger.kernel.org, Tomas Winkler Subject: [PATCH 2/2] Bluetooth: Fix TX error path in btsdio driver Date: Sat, 14 Feb 2009 13:02:06 +0200 Message-Id: <1234609326-583-3-git-send-email-tomas.winkler@intel.com> In-Reply-To: <1234609326-583-2-git-send-email-tomas.winkler@intel.com> References: <1234609326-583-1-git-send-email-tomas.winkler@intel.com> <1234609326-583-2-git-send-email-tomas.winkler@intel.com> Content-Type: text/plain; charset="us-ascii" List-ID: This patch fixes accumulating of the header in case packet was requeued in the error path. Signed-off-by: Tomas Winkler Signed-off-by: Marcel Holtmann --- drivers/bluetooth/btsdio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index cda6c7c..f2ada0c 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; } -- 1.6.0.6 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.