git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-iop3xx.c
diff --git
a/drivers/i2c/busses/i2c-iop3xx.c
b/drivers/i2c/busses/i2c-iop3xx.c
index
d00a02f
..
1414851
100644
(file)
--- a/
drivers/i2c/busses/i2c-iop3xx.c
+++ b/
drivers/i2c/busses/i2c-iop3xx.c
@@
-434,7
+434,7
@@
static int
iop3xx_i2c_probe(struct platform_device *pdev)
{
struct resource *res;
iop3xx_i2c_probe(struct platform_device *pdev)
{
struct resource *res;
- int ret
, irq
;
+ int ret;
struct i2c_adapter *new_adapter;
struct i2c_algo_iop3xx_data *adapter_data;
struct i2c_adapter *new_adapter;
struct i2c_algo_iop3xx_data *adapter_data;
@@
-470,12
+470,7
@@
iop3xx_i2c_probe(struct platform_device *pdev)
goto release_region;
}
goto release_region;
}
- irq = platform_get_irq(pdev, 0);
- if (irq < 0) {
- ret = -ENXIO;
- goto unmap;
- }
- ret = request_irq(irq, iop3xx_i2c_irq_handler, 0,
+ ret = request_irq(platform_get_irq(pdev, 0), iop3xx_i2c_irq_handler, 0,
pdev->name, adapter_data);
if (ret) {
pdev->name, adapter_data);
if (ret) {