- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / i2c / busses / i2c-nomadik.c

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index a4f8d33..73de8ad 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -704,7 +704,8 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
        case I2C_IT_MTD:
        case I2C_IT_MTDWS:
                if (dev->cli.operation == I2C_READ) {
-                       while (!readl(dev->virtbase + I2C_RISR) & I2C_IT_RXFE) {
+                       while (!(readl(dev->virtbase + I2C_RISR)
+                                & I2C_IT_RXFE)) {
                                if (dev->cli.count == 0)
                                        break;
                                *dev->cli.buffer =
@@ -914,6 +915,7 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
 
 static int __devexit nmk_i2c_remove(struct platform_device *pdev)
 {
+       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        struct nmk_i2c_dev *dev = platform_get_drvdata(pdev);
 
        i2c_del_adapter(&dev->adap);
@@ -924,6 +926,8 @@ static int __devexit nmk_i2c_remove(struct platform_device *pdev)
        i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);
        free_irq(dev->irq, dev);
        iounmap(dev->virtbase);
+       if (res)
+               release_mem_region(res->start, resource_size(res));
        clk_disable(dev->clk);
        clk_put(dev->clk);
        platform_set_drvdata(pdev, NULL);