Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -2
+2 -2
drivers/i2c/busses/i2c-parport.c
··· 189 189 if (adapter_parm[type].init.val) 190 190 line_set(port, 1, &adapter_parm[type].init); 191 191 192 - parport_release(adapter->pdev); 193 - 194 192 if (i2c_bit_add_bus(&adapter->adapter) < 0) { 195 193 printk(KERN_ERR "i2c-parport: Unable to register with I2C\n"); 196 194 goto ERROR1; ··· 200 202 return; 201 203 202 204 ERROR1: 205 + parport_release(adapter->pdev); 203 206 parport_unregister_device(adapter->pdev); 204 207 ERROR0: 205 208 kfree(adapter); ··· 220 221 if (adapter_parm[type].init.val) 221 222 line_set(port, 0, &adapter_parm[type].init); 222 223 224 + parport_release(adapter->pdev); 223 225 parport_unregister_device(adapter->pdev); 224 226 if (prev) 225 227 prev->next = adapter->next;