devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Grant Likely <grant.likely@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jakub Sitnicki <jsitnicki@gmail.com>,
	Vivek Goyal <vgoyal@redhat.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Jiang Liu <jiang.liu@linux.intel.com>,
	Mike Travis <travis@sgi.com>, Thierry Reding <treding@nvidia.com>,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH v3 2/4] base/platform: Only insert MEM and IO resources
Date: Wed, 22 Apr 2015 18:14:19 +0200	[thread overview]
Message-ID: <1429719261-18024-3-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1429719261-18024-1-git-send-email-ricardo.ribalda@gmail.com>

platform_device_del only checks the type of the resource in order to
call release_resource.

On the other hand, platform_device_add calls insert_resource for any
resource that has a parent.

Make both code branches balanced.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/base/platform.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ebf034b..6028681 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -341,19 +341,23 @@ int platform_device_add(struct platform_device *pdev)
 
 	for (i = 0; i < pdev->num_resources; i++) {
 		struct resource *p, *r = &pdev->resource[i];
+		unsigned long type = resource_type(r);
 
 		if (r->name == NULL)
 			r->name = dev_name(&pdev->dev);
 
+		if (!(type == IORESOURCE_MEM || type == IORESOURCE_IO))
+			continue;
+
 		p = r->parent;
 		if (!p) {
-			if (resource_type(r) == IORESOURCE_MEM)
+			if (type == IORESOURCE_MEM)
 				p = &iomem_resource;
-			else if (resource_type(r) == IORESOURCE_IO)
+			else if (type == IORESOURCE_IO)
 				p = &ioport_resource;
 		}
 
-		if (p && insert_resource(p, r)) {
+		if (insert_resource(p, r)) {
 			dev_err(&pdev->dev, "failed to claim resource %d\n", i);
 			ret = -EBUSY;
 			goto failed;
-- 
2.1.4

  parent reply	other threads:[~2015-04-22 16:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-22 16:14 [PATCH v3 0/4] Fix null pointer deference when calling of_platform_depopulate Ricardo Ribalda Delgado
2015-04-22 16:14 ` [PATCH v3 1/4] kernel/resource: Invalid memory access in __release_resource Ricardo Ribalda Delgado
2015-04-22 16:47   ` Bjorn Helgaas
     [not found]     ` <20150422164701.GJ20701-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-04-23  8:06       ` Ricardo Ribalda Delgado
2015-04-22 16:14 ` Ricardo Ribalda Delgado [this message]
2015-04-22 16:14 ` [PATCH v3 3/4] base/platform: Continue on insert_resource() error Ricardo Ribalda Delgado
     [not found]   ` <1429719261-18024-4-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-04-22 16:44     ` Bjorn Helgaas
     [not found]       ` <20150422164457.GI20701-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-04-23  7:55         ` Ricardo Ribalda Delgado
2015-04-23 13:26           ` Bjorn Helgaas
     [not found]             ` <20150423132637.GK20701-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-04-23 16:54               ` Thierry Reding
2015-04-22 16:14 ` [PATCH v3 4/4] of/platform: Use platform_device interface Ricardo Ribalda Delgado
     [not found]   ` <1429719261-18024-5-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-04-22 16:25     ` Rob Herring
2015-04-23  7:28       ` Ricardo Ribalda Delgado
     [not found]         ` <CAPybu_3Ej2ecFDTiJVL9TfE=ZLFN2wLKE_nFL2WjMQtk+4LO_A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-04-23 13:49           ` Ricardo Ribalda Delgado
2015-05-24 19:29     ` [PATCH v3.1 " Greg Kroah-Hartman
     [not found]       ` <20150524192915.GA7170-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2015-05-26  7:26         ` Ricardo Ribalda Delgado

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429719261-18024-3-git-send-email-ricardo.ribalda@gmail.com \
    --to=ricardo.ribalda@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jiang.liu@linux.intel.com \
    --cc=jsitnicki@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=travis@sgi.com \
    --cc=treding@nvidia.com \
    --cc=vgoyal@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).