diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 15:52:00 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 15:52:00 +0300 |
| commit | 4d117c5c6b00254e51c61ff5b506ccaba21a5a03 (patch) | |
| tree | ecb9d3ee4bfd9610c459c1eb0c0357c2905f3ae4 /drivers/i2c/busses/i2c-parport.c | |
| parent | 6c415b9234a8c71f290e5d4fddc467f103f32719 (diff) | |
| parent | 43714539eab42b2fa3653ea7bd667b36c2291b11 (diff) | |
| download | linux-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.tar.xz | |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'drivers/i2c/busses/i2c-parport.c')
| -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 59ba2086d2f9..a257cd5cd134 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; |