diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /drivers/parport/share.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
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 a2d9d1e5926..a848e02e6be 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c | |||
| @@ -678,7 +678,7 @@ void parport_unregister_device(struct pardevice *dev) | |||
| 678 | 678 | ||
| 679 | /* Make sure we haven't left any pointers around in the wait | 679 | /* Make sure we haven't left any pointers around in the wait |
| 680 | * list. */ | 680 | * list. */ |
| 681 | spin_lock (&port->waitlist_lock); | 681 | spin_lock_irq(&port->waitlist_lock); |
| 682 | if (dev->waitprev || dev->waitnext || port->waithead == dev) { | 682 | if (dev->waitprev || dev->waitnext || port->waithead == dev) { |
| 683 | if (dev->waitprev) | 683 | if (dev->waitprev) |
| 684 | dev->waitprev->waitnext = dev->waitnext; | 684 | dev->waitprev->waitnext = dev->waitnext; |
| @@ -689,7 +689,7 @@ void parport_unregister_device(struct pardevice *dev) | |||
| 689 | else | 689 | else |
| 690 | port->waittail = dev->waitprev; | 690 | port->waittail = dev->waitprev; |
| 691 | } | 691 | } |
| 692 | spin_unlock (&port->waitlist_lock); | 692 | spin_unlock_irq(&port->waitlist_lock); |
| 693 | 693 | ||
| 694 | kfree(dev->state); | 694 | kfree(dev->state); |
| 695 | kfree(dev); | 695 | kfree(dev); |