Commit fbd9a6d7 authored by Dan Williams's avatar Dan Williams Committed by Russell King

[ARM] 3079/1: Fix typo in i2c-iop3xx.c (invalid pointer passed to release_mem_region)

Patch from Dan Williams

* If request_irq fails then a call to release_mem_region will be made with an invalid pointer.
* Two formatting fixes
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d01e8897
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Copyright (C) 1995-1997 Simon G. Vogl, 1998-2000 Hans Berglund * Copyright (C) 1995-1997 Simon G. Vogl, 1998-2000 Hans Berglund
* *
* And which acknowledged Kysti Mlkki <kmalkki@cc.hut.fi>, * And which acknowledged Kyösti Mälkki <kmalkki@cc.hut.fi>,
* Frodo Looijaard <frodol@dds.nl>, Martin Bailey<mbailey@littlefeet-inc.com> * Frodo Looijaard <frodol@dds.nl>, Martin Bailey<mbailey@littlefeet-inc.com>
* *
* Major cleanup by Deepak Saxena <dsaxena@plexity.net>, 01/2005: * Major cleanup by Deepak Saxena <dsaxena@plexity.net>, 01/2005:
...@@ -184,7 +184,7 @@ iop3xx_i2c_wait_event(struct i2c_algo_iop3xx_data *iop3xx_adap, ...@@ -184,7 +184,7 @@ iop3xx_i2c_wait_event(struct i2c_algo_iop3xx_data *iop3xx_adap,
do { do {
interrupted = wait_event_interruptible_timeout ( interrupted = wait_event_interruptible_timeout (
iop3xx_adap->waitq, iop3xx_adap->waitq,
(done = compare( sr = iop3xx_i2c_get_srstat(iop3xx_adap) ,flags )), (done = compare( sr = iop3xx_i2c_get_srstat(iop3xx_adap) ,flags )),
1 * HZ; 1 * HZ;
); );
if ((rc = iop3xx_i2c_error(sr)) < 0) { if ((rc = iop3xx_i2c_error(sr)) < 0) {
...@@ -472,9 +472,10 @@ iop3xx_i2c_probe(struct device *dev) ...@@ -472,9 +472,10 @@ iop3xx_i2c_probe(struct device *dev)
goto release_region; goto release_region;
} }
res = request_irq(platform_get_irq(pdev, 0), iop3xx_i2c_irq_handler, 0, ret = request_irq(platform_get_irq(pdev, 0), iop3xx_i2c_irq_handler, 0,
pdev->name, adapter_data); pdev->name, adapter_data);
if (res) {
if (ret) {
ret = -EIO; ret = -EIO;
goto unmap; goto unmap;
} }
......
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