iio: buffer: Fix file related error handling in IIO_BUFFER_GET_FD_IOCTL

[linux-2.6-microblaze.git] / drivers / i2c / busses / i2c-bcm2835.c

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 37443ed..dfc5340 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -402,7 +402,7 @@ static const struct i2c_adapter_quirks bcm2835_i2c_quirks = {
 static int bcm2835_i2c_probe(struct platform_device *pdev)
 {
        struct bcm2835_i2c_dev *i2c_dev;
-       struct resource *mem, *irq;
+       struct resource *mem;
        int ret;
        struct i2c_adapter *adap;
        struct clk *mclk;
@@ -452,12 +452,9 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
                return ret;
        }
 
-       irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!irq) {
-               dev_err(&pdev->dev, "No IRQ resource\n");
-               return -ENODEV;
-       }
-       i2c_dev->irq = irq->start;
+       i2c_dev->irq = platform_get_irq(pdev, 0);
+       if (i2c_dev->irq < 0)
+               return i2c_dev->irq;
 
        ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED,
                          dev_name(&pdev->dev), i2c_dev);