diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-31 03:37:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:37 -0400 |
commit | 8daedea656ef48d36d1bda3d1339da484387c710 (patch) | |
tree | 3cc3d1048430815042e7336929c8ebfee6cd5a81 /drivers/parport | |
parent | c21b37f6449a3d799c7e75e978391674ee207600 (diff) |
parport_pc locking fix
http://bugzilla.kernel.org/show_bug.cgi?id=8821 reports a might_sleep()
warning due to parport_pc_exit() running platform_device_unregister() while
holding ports_lock.
Just remove the locking: nobody else can access ports_list during module_exit.
Cc: "Mike Sharkey" <mike@pikeaero.com>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_pc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 5d58ad55d85c..e2be84001105 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -3445,7 +3445,6 @@ static void __exit parport_pc_exit(void) | |||
3445 | pnp_unregister_driver (&parport_pc_pnp_driver); | 3445 | pnp_unregister_driver (&parport_pc_pnp_driver); |
3446 | platform_driver_unregister(&parport_pc_platform_driver); | 3446 | platform_driver_unregister(&parport_pc_platform_driver); |
3447 | 3447 | ||
3448 | spin_lock(&ports_lock); | ||
3449 | while (!list_empty(&ports_list)) { | 3448 | while (!list_empty(&ports_list)) { |
3450 | struct parport_pc_private *priv; | 3449 | struct parport_pc_private *priv; |
3451 | struct parport *port; | 3450 | struct parport *port; |
@@ -3455,11 +3454,8 @@ static void __exit parport_pc_exit(void) | |||
3455 | if (port->dev && port->dev->bus == &platform_bus_type) | 3454 | if (port->dev && port->dev->bus == &platform_bus_type) |
3456 | platform_device_unregister( | 3455 | platform_device_unregister( |
3457 | to_platform_device(port->dev)); | 3456 | to_platform_device(port->dev)); |
3458 | spin_unlock(&ports_lock); | ||
3459 | parport_pc_unregister_port(port); | 3457 | parport_pc_unregister_port(port); |
3460 | spin_lock(&ports_lock); | ||
3461 | } | 3458 | } |
3462 | spin_unlock(&ports_lock); | ||
3463 | } | 3459 | } |
3464 | 3460 | ||
3465 | MODULE_AUTHOR("Phil Blundell, Tim Waugh, others"); | 3461 | MODULE_AUTHOR("Phil Blundell, Tim Waugh, others"); |