From patchwork Tue Apr 11 10:20:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 9674889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4A86A600CB for ; Tue, 11 Apr 2017 10:28:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F8AF2854E for ; Tue, 11 Apr 2017 10:28:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 446B628550; Tue, 11 Apr 2017 10:28:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD6042854E for ; Tue, 11 Apr 2017 10:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752676AbdDKK1g (ORCPT ); Tue, 11 Apr 2017 06:27:36 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:46080 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752046AbdDKK0D (ORCPT ); Tue, 11 Apr 2017 06:26:03 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v3BAF5bM025800; Tue, 11 Apr 2017 03:25:35 -0700 Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 29pycex9dj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2017 03:25:35 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 11 Apr 2017 03:25:34 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Tue, 11 Apr 2017 03:25:34 -0700 Received: from xhacker.marvell.com (unknown [10.37.130.129]) by maili.marvell.com (Postfix) with ESMTP id D4CB03F7040; Tue, 11 Apr 2017 03:25:32 -0700 (PDT) From: Jisheng Zhang To: , CC: , , , Jisheng Zhang Subject: [PATCH 1/2] mmc: slot-gpio: check cd_gpio before setting up cd_gpio_isr Date: Tue, 11 Apr 2017 18:20:55 +0800 Message-ID: <20170411102056.2869-2-jszhang@marvell.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170411102056.2869-1-jszhang@marvell.com> References: <20170411102056.2869-1-jszhang@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-04-11_08:, , signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704110085 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP slot-gpio knows more information than its user, such as whether there is cd gpio_desc or not. While one of its user -- the common sdhci driver doesn't know it. To prepare for next patch which will setup sdhci's own isr for card-detect interrupts, we add the check before setting up cd_gpio_isr. Signed-off-by: Jisheng Zhang --- drivers/mmc/core/slot-gpio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c index a8450a8701e4..42b260593955 100644 --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -162,6 +162,9 @@ void mmc_gpio_set_cd_isr(struct mmc_host *host, { struct mmc_gpio *ctx = host->slot.handler_priv; + if (!ctx->cd_gpio) + return; + WARN_ON(ctx->cd_gpio_isr); ctx->cd_gpio_isr = isr; }