i2c: i801: Fallback to polling if request_irq() fails

The i2c-i801 driver can work without interrupts, so there is no reason
to make a request_irq failure fatal. Instead we can simply fallback
to polling.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 67661bb..a6f3bc3 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1239,10 +1239,11 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                if (err) {
                        dev_err(&dev->dev, "Failed to allocate irq %d: %d\n",
                                dev->irq, err);
                if (err) {
                        dev_err(&dev->dev, "Failed to allocate irq %d: %d\n",
                                dev->irq, err);

-                       goto exit_release;
+                       priv->features &= ~FEATURE_IRQ;

                }
                }

-               dev_info(&dev->dev, "SMBus using PCI Interrupt\n");

        }
        }

+       dev_info(&dev->dev, "SMBus using %s\n",
+                priv->features & FEATURE_IRQ ? "PCI interrupt" : "polling");

 
        /* set up the sysfs linkage to our parent device */
        priv->adapter.dev.parent = &dev->dev;
 
        /* set up the sysfs linkage to our parent device */
        priv->adapter.dev.parent = &dev->dev;


@@ -1269,7 +1270,6 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 exit_free_irq:
        if (priv->features & FEATURE_IRQ)
                free_irq(dev->irq, priv);
 exit_free_irq:
        if (priv->features & FEATURE_IRQ)
                free_irq(dev->irq, priv);

-exit_release:

        pci_release_region(dev, SMBBAR);
 exit:
        kfree(priv);
        pci_release_region(dev, SMBBAR);
 exit:
        kfree(priv);