Merge tag 'driver-core-3.16-rc6' of... (f47d5bb0) · Commits · 戴 / test

Merge tag 'driver-core-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core fix from Greg KH: "Here is a single driver core fix that reverts an older patch that has been causing a number of reported problems with the platform devices. This revert has been in linux-next for a while with no reported issues" * tag 'driver-core-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: platform_get_irq: Revert to platform_get_resource if of_irq_get fails

drivers/base/platform.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -89,8 +89,13 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
		return dev->archdata.irqs[num];
		#else
		struct resource *r;
		if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node)
		return of_irq_get(dev->dev.of_node, num);
		if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) {
		int ret;

		ret = of_irq_get(dev->dev.of_node, num);
		if (ret >= 0 \|\| ret == -EPROBE_DEFER)
		return ret;
		}

		r = platform_get_resource(dev, IORESOURCE_IRQ, num);

		@@ -133,8 +138,13 @@ int platform_get_irq_byname(struct platform_device dev, const char name)
		{
		struct resource *r;

		if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node)
		return of_irq_get_byname(dev->dev.of_node, name);
		if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) {
		int ret;

		ret = of_irq_get_byname(dev->dev.of_node, name);
		if (ret >= 0 \|\| ret == -EPROBE_DEFER)
		return ret;
		}

		r = platform_get_resource_byname(dev, IORESOURCE_IRQ, name);
		return r ? r->start : -ENXIO;

Admin message