From patchwork Mon Sep 10 02:56:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ball X-Patchwork-Id: 1429131 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DD9C2402E1 for ; Mon, 10 Sep 2012 02:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755685Ab2IJC4w (ORCPT ); Sun, 9 Sep 2012 22:56:52 -0400 Received: from void.printf.net ([89.145.121.20]:52568 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755074Ab2IJC4v (ORCPT ); Sun, 9 Sep 2012 22:56:51 -0400 Received: from c-76-24-28-220.hsd1.ma.comcast.net ([76.24.28.220] helo=octavius.laptop.org) by void.printf.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1TAuB8-00042N-GZ; Mon, 10 Sep 2012 03:56:50 +0100 From: Chris Ball To: Guennadi Liakhovetski Cc: linux-mmc@vger.kernel.org Subject: [PATCH v2] mmc: slot-gpio: Fix missing assignment to ctx->ro_gpio References: <87pq5vzyry.fsf@octavius.laptop.org> Date: Sun, 09 Sep 2012 22:56:48 -0400 In-Reply-To: (Guennadi Liakhovetski's message of "Sun, 9 Sep 2012 23:21:20 +0200 (CEST)") Message-ID: <87627mzitr.fsf_-_@octavius.laptop.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org mmc_gpio_request_ro() doesn't store the requested gpio in ctx->ro_gpio. As a result, subsequent calls to mmc_gpio_get_ro() will always fail with -ENOSYS because the gpio number isn't available to that function. Cc: stable Signed-off-by: Chris Ball Acked-by: Guennadi Liakhovetski --- v2, addressing Guennadi's review comments: - If gpio_request_one() fails, ctx->ro_gpio shouldn't contain a valid GPIO number. drivers/mmc/core/slot-gpio.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c index 0582429..08c6b3d 100644 --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -100,7 +100,13 @@ int mmc_gpio_request_ro(struct mmc_host *host, unsigned int gpio) ctx = host->slot.handler_priv; - return gpio_request_one(gpio, GPIOF_DIR_IN, ctx->ro_label); + ret = gpio_request_one(gpio, GPIOF_DIR_IN, ctx->ro_label); + if (ret < 0) + return ret; + + ctx->ro_gpio = gpio; + + return 0; } EXPORT_SYMBOL(mmc_gpio_request_ro);