From c909fa5919a5831e059a15bbd61fcdc246079641 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Tue, 27 Apr 2010 10:31:07 +0530 Subject: [PATCH] --- yaml --- r: 193179 b: refs/heads/master c: a1c27678c0e92ed4aa3ac489ef2f0d80651e18bb h: refs/heads/master i: 193177: 011fc3afe605952e6e185999dd9f8df74c0db51e 193175: 82006312b19c4d061f65243185bf93a2cc82b383 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-nomadik.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index be34d8b1d639..d7340690d442 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a9d97d3a126fd33894e137f84ab47ec406df24f +refs/heads/master: a1c27678c0e92ed4aa3ac489ef2f0d80651e18bb diff --git a/trunk/drivers/i2c/busses/i2c-nomadik.c b/trunk/drivers/i2c/busses/i2c-nomadik.c index a4f8d33fa389..170dbd70b934 100644 --- a/trunk/drivers/i2c/busses/i2c-nomadik.c +++ b/trunk/drivers/i2c/busses/i2c-nomadik.c @@ -914,6 +914,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 +925,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);