Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753452AbdDKK1g (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 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 Content-Type: text/plain 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 832 Lines: 27 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; } -- 2.11.0