From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965641AbcBCWUN (ORCPT ); Wed, 3 Feb 2016 17:20:13 -0500 Received: from smtp11.smtpout.orange.fr ([80.12.242.133]:60455 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965611AbcBCWUK (ORCPT ); Wed, 3 Feb 2016 17:20:10 -0500 X-ME-Helo: belgarion.home X-ME-Date: Wed, 03 Feb 2016 23:20:08 +0100 X-ME-IP: 109.214.175.60 From: Robert Jarzmik To: Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Jarzmik Subject: [PATCH] mmc: pxamci: fix the device-tree probe deferral path Date: Wed, 3 Feb 2016 23:19:52 +0100 Message-Id: <1454537992-15839-1-git-send-email-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the gpio driver is probed after the mmc one, the read/write gpio and card detection one return -EPROBE_DEFER. Unfortunately, the memory region remains requested, and upon the next probe, the probe will fail anyway with -EBUSY. Fix this by releasing the memory resource upon probe failure. Signed-off-by: Robert Jarzmik --- drivers/mmc/host/pxamci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 28a057fae0a1..405ec339a1b8 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -657,7 +657,7 @@ static int pxamci_probe(struct platform_device *pdev) if (!r || irq < 0) return -ENXIO; - r = request_mem_region(r->start, SZ_4K, DRIVER_NAME); + r = devm_request_mem_region(&pdev->dev, r->start, SZ_4K, DRIVER_NAME); if (!r) return -EBUSY; @@ -840,7 +840,6 @@ out: } if (mmc) mmc_free_host(mmc); - release_resource(r); return ret; } -- 2.1.4