summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-09-13 20:32:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-27 12:30:37 +0200
commit60ca5e0d280b1a51df55c5fc2e5bfe010b344c5a (patch)
tree3389804982b1d415687846bb67308b646cf5320b /drivers/base
parent78618d395b65fadb2937a985308c3a4d2897ade2 (diff)
downloadlinux-stable-60ca5e0d280b1a51df55c5fc2e5bfe010b344c5a.tar.gz
linux-stable-60ca5e0d280b1a51df55c5fc2e5bfe010b344c5a.tar.bz2
linux-stable-60ca5e0d280b1a51df55c5fc2e5bfe010b344c5a.zip
driver-core: platform: Catch errors from calls to irq_get_irq_data
irq_get_irq_data() can return NULL, which results in a nasty crash. Check its return value before passing it on to irqd_set_trigger_type(). Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 44c9d4daf510..c4af00385502 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -108,9 +108,14 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
* IORESOURCE_BITS correspond 1-to-1 to the IRQF_TRIGGER*
* settings.
*/
- if (r && r->flags & IORESOURCE_BITS)
- irqd_set_trigger_type(irq_get_irq_data(r->start),
- r->flags & IORESOURCE_BITS);
+ if (r && r->flags & IORESOURCE_BITS) {
+ struct irq_data *irqd;
+
+ irqd = irq_get_irq_data(r->start);
+ if (!irqd)
+ return -ENXIO;
+ irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS);
+ }
return r ? r->start : -ENXIO;
#endif