提交 46d74c38 编写于 作者: D Dan Carpenter 提交者: Greg Kroah-Hartman

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: NDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: NDavid Matlack <dmatlack@google.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 24768169
...@@ -1392,7 +1392,7 @@ static void slic_cmdq_reset(struct adapter *adapter) ...@@ -1392,7 +1392,7 @@ static void slic_cmdq_reset(struct adapter *adapter)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&adapter->cmdq_free.lock, 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_all.count - adapter->cmdq_done.count;
outstanding -= adapter->cmdq_free.count; outstanding -= adapter->cmdq_free.count;
hcmd = adapter->cmdq_all.head; hcmd = adapter->cmdq_all.head;
...@@ -1423,7 +1423,7 @@ static void slic_cmdq_reset(struct adapter *adapter) ...@@ -1423,7 +1423,7 @@ static void slic_cmdq_reset(struct adapter *adapter)
"free_count %d != all count %d\n", "free_count %d != all count %d\n",
adapter->cmdq_free.count, adapter->cmdq_all.count); 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); spin_unlock_irqrestore(&adapter->cmdq_free.lock, flags);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册