staging: slicoss: restore IRQs correctly after slic_cmdq_reset()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 19 May 2015 12:25:24 +0000 (15:25 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 31 May 2015 02:47:56 +0000 (11:47 +0900)
We can't save two different values in "flags" so it means that IRQs are
not enabled properly at the end of this function.  This isn't a problem
in the current code because it's always called with IRQs disabled so we
don't want to enable them at the end.

This bug is old but it's thanks to David Matlack's recent cleanups that
Smatch can detect it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/slicoss/slicoss.c

index 5f34ebbf7b313901f90cb7c4318853e10bb6dbaa..a609f3e67256aba12dbfda1fb9e1e2d3958c2f67 100644 (file)
@@ -1392,7 +1392,7 @@ static void slic_cmdq_reset(struct adapter *adapter)
        unsigned long flags;
 
        spin_lock_irqsave(&adapter->cmdq_free.lock, flags);
-       spin_lock_irqsave(&adapter->cmdq_done.lock, flags);
+       spin_lock(&adapter->cmdq_done.lock);
        outstanding = adapter->cmdq_all.count - adapter->cmdq_done.count;
        outstanding -= adapter->cmdq_free.count;
        hcmd = adapter->cmdq_all.head;
@@ -1423,7 +1423,7 @@ static void slic_cmdq_reset(struct adapter *adapter)
                        "free_count %d != all count %d\n",
                        adapter->cmdq_free.count, adapter->cmdq_all.count);
        }
-       spin_unlock_irqrestore(&adapter->cmdq_done.lock, flags);
+       spin_unlock(&adapter->cmdq_done.lock);
        spin_unlock_irqrestore(&adapter->cmdq_free.lock, flags);
 }