From patchwork Mon May 25 10:10:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sperl X-Patchwork-Id: 6473121 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6FA1E9F1C1 for ; Mon, 25 May 2015 10:10:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55E06203AD for ; Mon, 25 May 2015 10:10:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3EA9203C3 for ; Mon, 25 May 2015 10:10:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624AbbEYKKo (ORCPT ); Mon, 25 May 2015 06:10:44 -0400 Received: from 212-186-180-163.dynamic.surfer.at ([212.186.180.163]:50854 "EHLO cgate.sperl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752236AbbEYKKo (ORCPT ); Mon, 25 May 2015 06:10:44 -0400 Received: from raspb.intern.sperl.org (account martin@sperl.org [10.10.10.32] verified) by sperl.org (CommuniGate Pro SMTP 6.1.2) with ESMTPSA id 6330031; Mon, 25 May 2015 10:10:40 +0000 From: kernel@martin.sperl.org To: Mark Brown , linux-spi@vger.kernel.org Cc: Martin Sperl Subject: [PATCH V2] spi: add missing cleanup in spi_map_msg on error Date: Mon, 25 May 2015 10:10:29 +0000 Message-Id: <1432548630-2202-1-git-send-email-kernel@martin.sperl.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432460086-2549-1-git-send-email-kernel@martin.sperl.org> References: <1432460086-2549-1-git-send-email-kernel@martin.sperl.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Martin Sperl Signed-off-by: Martin Sperl --- drivers/spi/spi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Changelog: [V1 -> V2]: for the cleanup to work propperly cur_msg_mapped needs to be set, as spi_unmap_msg checks for this condition and will not clean up otherwise (which happened in V1) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index d35c1a1..647a8bb 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -552,6 +552,7 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg) DMA_TO_DEVICE); if (ret != 0) return ret; + master->cur_msg_mapped = true; } if (xfer->rx_buf != NULL) { @@ -563,11 +564,10 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg) DMA_TO_DEVICE); return ret; } + master->cur_msg_mapped = true; } } - master->cur_msg_mapped = true; - return 0; } @@ -620,6 +620,7 @@ static int spi_map_msg(struct spi_master *master, struct spi_message *msg) struct spi_transfer *xfer; void *tmp; unsigned int max_tx, max_rx; + int ret; if (master->flags & (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX)) { max_tx = 0; @@ -662,7 +663,11 @@ static int spi_map_msg(struct spi_master *master, struct spi_message *msg) } } - return __spi_map_msg(master, msg); + ret = __spi_map_msg(master, msg); + if (ret) + spi_unmap_msg(master, msg); + + return ret; } /*