From: Dan Carpenter Date: Tue, 19 May 2015 12:25:24 +0000 (+0300) Subject: staging: slicoss: restore IRQs correctly after slic_cmdq_reset() X-Git-Tag: firefly_0821_release~176^2~1545^2~459 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=46d74c38eba22bee848c205e8a98fc4b6b53a081;p=firefly-linux-kernel-4.4.55.git staging: slicoss: restore IRQs correctly after slic_cmdq_reset() 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 Reviewed-by: David Matlack Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 5f34ebbf7b31..a609f3e67256 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -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); }