Staging: sxg: Fix sleep in atomic context warning while loading driver
authorMithlesh Thukral <mithlesh@linsyssoft.com>
Wed, 25 Mar 2009 10:21:14 +0000 (15:51 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 17 Apr 2009 18:06:31 +0000 (11:06 -0700)
Leave a spinlock before calling request_irq(). request_irq() calls kmalloc
which can sleep. This was generating a warning dump while driver is loaded.

Signed-off-by: LinSysSoft Sahara Team <saharaproj@linsyssoft.com>
Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/sxg/sxg.c

index d8edf42..583fbb4 100644 (file)
@@ -322,6 +322,8 @@ int sxg_add_msi_isr(struct adapter_t *adapter)
        int ret,i;
 
        if (!adapter->intrregistered) {
+               spin_unlock_irqrestore(&sxg_global.driver_lock,
+                                       sxg_global.flags);
                for (i=0; i<adapter->nr_msix_entries; i++) {
                        ret = request_irq (adapter->msi_entries[i].vector,
                                        sxg_isr,
@@ -329,6 +331,8 @@ int sxg_add_msi_isr(struct adapter_t *adapter)
                                        adapter->netdev->name,
                                        adapter->netdev);
                        if (ret) {
+                               spin_lock_irqsave(&sxg_global.driver_lock,
+                                                sxg_global.flags);
                                DBG_ERROR("sxg: MSI-X request_irq (%s) "
                                        "FAILED [%x]\n", adapter->netdev->name,
                                         ret);
@@ -336,6 +340,7 @@ int sxg_add_msi_isr(struct adapter_t *adapter)
                        }
                }
        }
+       spin_lock_irqsave(&sxg_global.driver_lock, sxg_global.flags);
        adapter->msi_enabled = TRUE;
        adapter->intrregistered = 1;
        adapter->IntRegistered = TRUE;