diff options
| author | Jean Delvare <khali@linux-fr.org> | 2008-11-28 15:24:39 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2008-11-28 15:24:39 +0100 |
| commit | 7b964f733798960c899dc40911329aee7bee25e4 (patch) | |
| tree | eb971e0bdcaddc580874d47048c24ce3bbe10d18 /drivers/i2c | |
| parent | 79b93e1359b1414b438f239c6e5e0ad91232e4c8 (diff) | |
| download | linux-3.10-7b964f733798960c899dc40911329aee7bee25e4.tar.gz linux-3.10-7b964f733798960c899dc40911329aee7bee25e4.tar.bz2 linux-3.10-7b964f733798960c899dc40911329aee7bee25e4.zip | |
i2c-parport: Fix misplaced parport_release call
We shouldn't release the parallel port until we are actually done with
it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-parport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index 59ba2086d2f..a257cd5cd13 100644 --- a/drivers/i2c/busses/i2c-parport.c +++ b/drivers/i2c/busses/i2c-parport.c @@ -189,8 +189,6 @@ static void i2c_parport_attach (struct parport *port) if (adapter_parm[type].init.val) line_set(port, 1, &adapter_parm[type].init); - parport_release(adapter->pdev); - if (i2c_bit_add_bus(&adapter->adapter) < 0) { printk(KERN_ERR "i2c-parport: Unable to register with I2C\n"); goto ERROR1; @@ -202,6 +200,7 @@ static void i2c_parport_attach (struct parport *port) return; ERROR1: + parport_release(adapter->pdev); parport_unregister_device(adapter->pdev); ERROR0: kfree(adapter); @@ -221,6 +220,7 @@ static void i2c_parport_detach (struct parport *port) if (adapter_parm[type].init.val) line_set(port, 0, &adapter_parm[type].init); + parport_release(adapter->pdev); parport_unregister_device(adapter->pdev); if (prev) prev->next = adapter->next; |