Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756565AbcCBAyf (ORCPT ); Tue, 1 Mar 2016 19:54:35 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:48096 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755936AbcCAX42 (ORCPT ); Tue, 1 Mar 2016 18:56:28 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=AOv78qYnWRWglNja2zYAOhKZbLkRQvQXSZffUqrGNfvssf+X9hqSYWYYOkPQ+wBVsXUw04Mm+9U1 XO0sgIYQsqtHUxw6kc6LgIiHJmbURZkP4SosAzuaFWkhKvqzWBKMFHXq+R3B0/GKzd/m6UXc+392 i/vQpq4Sxz31T2j664o=; From: Greg Kroah-Hartman Subject: [PATCH 4.4 141/342] mmc: pxamci: fix again read-only gpio detection polarity X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Andrea Adami , Robert Jarzmik , Ulf Hansson Message-Id: <20160301234532.527395001@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.f0b682abb4854bbebeca72a808f2efb5 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:54:30 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1322 Lines: 36 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robert Jarzmik commit 41c89159a6ae5472d39ed8bded5b3b4e07a37944 upstream. The commit fixing the conversion of pxamci to slot-gpio API fixed the inverted the logic of the read-only gpio. Unfortunately, the commit was tested on a non-inverted gpio, and not on the inverted one. And the fix did work partially, by luck. This is the remaining missing part of the fix, trivial but still necessary. Fixes: Fixes: 26d49fe71953 ("mmc: pxamci: fix read-only gpio detection polarity") Reported-by: Andrea Adami Tested-by: Andrea Adami Signed-off-by: Robert Jarzmik Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/pxamci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -804,7 +804,7 @@ static int pxamci_probe(struct platform_ dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_ro); goto out; } else { - mmc->caps |= host->pdata->gpio_card_ro_invert ? + mmc->caps2 |= host->pdata->gpio_card_ro_invert ? 0 : MMC_CAP2_RO_ACTIVE_HIGH; }