Commit ede7193d authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by David S. Miller

sky2: fix missing register reset on error path in sky2_test_msi()

In sky2_test_msi() the temporarily set SW IRQ in B0 register is not reset in case
that request_irq() fails.
With this patch we only set the interrupt mask if request_irq() was successful.
Signed-off-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb6a2481
...@@ -4804,14 +4804,14 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw) ...@@ -4804,14 +4804,14 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
init_waitqueue_head(&hw->msi_wait); init_waitqueue_head(&hw->msi_wait);
sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
err = request_irq(pdev->irq, sky2_test_intr, 0, DRV_NAME, hw); err = request_irq(pdev->irq, sky2_test_intr, 0, DRV_NAME, hw);
if (err) { if (err) {
dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq); dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq);
return err; return err;
} }
sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ); sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ);
sky2_read8(hw, B0_CTST); sky2_read8(hw, B0_CTST);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment