diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 09:43:56 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 09:43:56 +0100 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/parport/share.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
| download | kernel_samsung_smdk4412-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.zip kernel_samsung_smdk4412-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.tar.gz kernel_samsung_smdk4412-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.tar.bz2 | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'drivers/parport/share.c')
| -rw-r--r-- | drivers/parport/share.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parport/share.c b/drivers/parport/share.c index a2d9d1e..a848e02 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c @@ -678,7 +678,7 @@ void parport_unregister_device(struct pardevice *dev) /* Make sure we haven't left any pointers around in the wait * list. */ - spin_lock (&port->waitlist_lock); + spin_lock_irq(&port->waitlist_lock); if (dev->waitprev || dev->waitnext || port->waithead == dev) { if (dev->waitprev) dev->waitprev->waitnext = dev->waitnext; @@ -689,7 +689,7 @@ void parport_unregister_device(struct pardevice *dev) else port->waittail = dev->waitprev; } - spin_unlock (&port->waitlist_lock); + spin_unlock_irq(&port->waitlist_lock); kfree(dev->state); kfree(dev); |