]> err.no Git - linux-2.6/commitdiff
parport_pc locking fix
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 31 Jul 2007 07:37:43 +0000 (00:37 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 31 Jul 2007 22:39:37 +0000 (15:39 -0700)
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>
drivers/parport/parport_pc.c

index 5d58ad55d85c65d4c0d379b19bacfde13e931aab..e2be84001105588a8939625fc3aecde88d7211d0 100644 (file)
@@ -3445,7 +3445,6 @@ static void __exit parport_pc_exit(void)
                pnp_unregister_driver (&parport_pc_pnp_driver);
        platform_driver_unregister(&parport_pc_platform_driver);
 
-       spin_lock(&ports_lock);
        while (!list_empty(&ports_list)) {
                struct parport_pc_private *priv;
                struct parport *port;
@@ -3455,11 +3454,8 @@ static void __exit parport_pc_exit(void)
                if (port->dev && port->dev->bus == &platform_bus_type)
                        platform_device_unregister(
                                to_platform_device(port->dev));
-               spin_unlock(&ports_lock);
                parport_pc_unregister_port(port);
-               spin_lock(&ports_lock);
        }
-       spin_unlock(&ports_lock);
 }
 
 MODULE_AUTHOR("Phil Blundell, Tim Waugh, others");