From patchwork Mon Apr 18 11:43:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 8871681 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 38435BF29F for ; Mon, 18 Apr 2016 11:44:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25FE520272 for ; Mon, 18 Apr 2016 11:44:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3996A20270 for ; Mon, 18 Apr 2016 11:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752114AbcDRLoM (ORCPT ); Mon, 18 Apr 2016 07:44:12 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:34244 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbcDRLoL (ORCPT ); Mon, 18 Apr 2016 07:44:11 -0400 Received: by mail-lf0-f45.google.com with SMTP id j11so212984893lfb.1 for ; Mon, 18 Apr 2016 04:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=jKUDTw73jxzp4qtK6fL9C1QMTjQz6oM52wUhX+EirPU=; b=VWf/XA7Tui/JcZ+gX9EF3RMRWU5fHk13SGmvo9MIgrbd8Sujnrto4xIKJq3jUlc9n6 dlTYBZ4++1kqiSiKaETNk3If2s76eTyYy+qGREIMSxKU6+6a04AlJ7Zb8NdBD475HFEr 2ZYH0jzvdE8v25K7toP1ToxgG/UDq6kTgi85A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=jKUDTw73jxzp4qtK6fL9C1QMTjQz6oM52wUhX+EirPU=; b=Nnuk5jasNM26z4MZax37/2qaGFTW45GlvYV2GiDHYuW3V8IaQTWxQ6BMWKh1UoSTHR UnKWAUaZoVb4EphTPScM1y22x1y+rztj5Asp8moPZ0yEFYomSqKtxyrkOhS+tsPAYeeq u1b6EDKeF7UW9VChXu02CEibOjcfU7IB9aIpk4YwWpJlsJva7Tmoy5cF2c2CfQDZnXsZ CccANYqTll2HGN89A1X6+B4gGsfpCKM/egSDdlccQeeCQpppoUAEvuEZLI1xHNZVcGMa zvt3tzjX1C8lSmWtZz3kfV+6D092EGu/AeENZ0uSfWu3kLE+ywmlqlmspLAIKrHEorh4 s06A== X-Gm-Message-State: AOPr4FX5BNgZJwtp9QxOWI9NOLtgeQUBOSQCEHCIzmZ9kNZv+8q9ylopHa3zVE2Z/JBdpjl9 X-Received: by 10.112.124.197 with SMTP id mk5mr1377121lbb.60.1460979849653; Mon, 18 Apr 2016 04:44:09 -0700 (PDT) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id jo1sm10010232lbc.3.2016.04.18.04.44.07 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Apr 2016 04:44:08 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 2/3] mmc: block: Release index in partition allocation error path Date: Mon, 18 Apr 2016 13:43:53 +0200 Message-Id: <1460979834-24582-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460979834-24582-1-git-send-email-ulf.hansson@linaro.org> References: <1460979834-24582-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 If the allocation of a new partition fails, let's make sure to also release the previously picked device index. Signed-off-by: Ulf Hansson --- drivers/mmc/card/block.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 8a0147d..9aaf22e 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2289,6 +2289,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, err_kfree: kfree(md); out: + __clear_bit(devidx, dev_use); return ERR_PTR(ret); }