From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966022AbbDVQQB (ORCPT ); Wed, 22 Apr 2015 12:16:01 -0400 Received: from mail-lb0-f180.google.com ([209.85.217.180]:35184 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965708AbbDVQO3 (ORCPT ); Wed, 22 Apr 2015 12:14:29 -0400 From: Ricardo Ribalda Delgado To: Greg Kroah-Hartman , Grant Likely , Rob Herring , Andrew Morton , Jakub Sitnicki , Vivek Goyal , Bjorn Helgaas , Jiang Liu , Mike Travis , Thierry Reding , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v3 3/4] base/platform: Continue on insert_resource() error Date: Wed, 22 Apr 2015 18:14:20 +0200 Message-Id: <1429719261-18024-4-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1429719261-18024-1-git-send-email-ricardo.ribalda@gmail.com> References: <1429719261-18024-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org insert_resource() can fail when the resource added overlaps (partially or fully) with another. Device tree and AMBA devices may contain resources that overlap, so they could not call platform_device_add (Revert "of: use platform_device_add" 02bbde7849e68e193cefaa1885fe0df0f03c9fcd ) On the other hand, device trees are released using platform_device_unregister(). This function calls platform_device_del(), which calls release_resource(), that crashes when the resource has not been added with with insert_resource. This was not an issue when the device tree could not be modified online, but this is not the case anymore. This patch let the flow continue when there is an insert error, after notifying the user with a dev_err(). r->parent is set to NULL, so the device_del knows that the resource was not added, and therefore it should not be released. Signed-off-by: Ricardo Ribalda Delgado --- drivers/base/platform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 6028681..8cce2a3 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -359,8 +359,7 @@ int platform_device_add(struct platform_device *pdev) if (insert_resource(p, r)) { dev_err(&pdev->dev, "failed to claim resource %d\n", i); - ret = -EBUSY; - goto failed; + r->parent = NULL; } } @@ -371,7 +370,6 @@ int platform_device_add(struct platform_device *pdev) if (ret == 0) return ret; - failed: if (pdev->id_auto) { ida_simple_remove(&platform_devid_ida, pdev->id); pdev->id = PLATFORM_DEVID_AUTO; @@ -381,7 +379,8 @@ int platform_device_add(struct platform_device *pdev) struct resource *r = &pdev->resource[i]; unsigned long type = resource_type(r); - if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) && + r->parent) release_resource(r); } @@ -414,7 +413,8 @@ void platform_device_del(struct platform_device *pdev) struct resource *r = &pdev->resource[i]; unsigned long type = resource_type(r); - if (type == IORESOURCE_MEM || type == IORESOURCE_IO) + if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) && + r->parent) release_resource(r); } } -- 2.1.4