Commit 7b964f73 authored by Jean Delvare's avatar Jean Delvare

i2c-parport: Fix misplaced parport_release call

We shouldn't release the parallel port until we are actually done with
it.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 79b93e13
...@@ -189,8 +189,6 @@ static void i2c_parport_attach (struct parport *port) ...@@ -189,8 +189,6 @@ static void i2c_parport_attach (struct parport *port)
if (adapter_parm[type].init.val) if (adapter_parm[type].init.val)
line_set(port, 1, &adapter_parm[type].init); line_set(port, 1, &adapter_parm[type].init);
parport_release(adapter->pdev);
if (i2c_bit_add_bus(&adapter->adapter) < 0) { if (i2c_bit_add_bus(&adapter->adapter) < 0) {
printk(KERN_ERR "i2c-parport: Unable to register with I2C\n"); printk(KERN_ERR "i2c-parport: Unable to register with I2C\n");
goto ERROR1; goto ERROR1;
...@@ -202,6 +200,7 @@ static void i2c_parport_attach (struct parport *port) ...@@ -202,6 +200,7 @@ static void i2c_parport_attach (struct parport *port)
return; return;
ERROR1: ERROR1:
parport_release(adapter->pdev);
parport_unregister_device(adapter->pdev); parport_unregister_device(adapter->pdev);
ERROR0: ERROR0:
kfree(adapter); kfree(adapter);
...@@ -221,6 +220,7 @@ static void i2c_parport_detach (struct parport *port) ...@@ -221,6 +220,7 @@ static void i2c_parport_detach (struct parport *port)
if (adapter_parm[type].init.val) if (adapter_parm[type].init.val)
line_set(port, 0, &adapter_parm[type].init); line_set(port, 0, &adapter_parm[type].init);
parport_release(adapter->pdev);
parport_unregister_device(adapter->pdev); parport_unregister_device(adapter->pdev);
if (prev) if (prev)
prev->next = adapter->next; prev->next = adapter->next;
......
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