Commit aef6f2e7 authored by Dave Stevenson's avatar Dave Stevenson Committed by Wolfram Sang

i2c: brcmstb: Fix handling of optional interrupt

If there is no interrupt defined then an error is logged due
to the use of platform_get_irq. The driver handles not having
the interrupt by falling back to polling, therefore make
the appropriate call when claiming it.
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 88fb09c4
...@@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) ...@@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
int_name = NULL; int_name = NULL;
/* Get the interrupt number */ /* Get the interrupt number */
dev->irq = platform_get_irq(pdev, 0); dev->irq = platform_get_irq_optional(pdev, 0);
/* disable the bsc interrupt line */ /* disable the bsc interrupt line */
brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE); brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE);
/* register the ISR handler */ /* register the ISR handler */
rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr, if (dev->irq >= 0) {
IRQF_SHARED, rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr,
int_name ? int_name : pdev->name, IRQF_SHARED,
dev); int_name ? int_name : pdev->name,
dev);
if (rc) {
dev_dbg(dev->device, "falling back to polling mode"); if (rc) {
dev->irq = -1; dev_dbg(dev->device, "falling back to polling mode");
dev->irq = -1;
}
} }
if (of_property_read_u32(dev->device->of_node, if (of_property_read_u32(dev->device->of_node,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment