Skip to content

Commit

Permalink
block: IBM RamSan 70/80 error message bug fix.
Browse files Browse the repository at this point in the history
This patch includes a simple change to the rsxx_pci_remove
function that caused error messages because traffic was halted
too early.

Signed-off-by: Philip J Kelleher <pjk1939@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Philip J Kelleher authored and axboe committed Mar 11, 2013
1 parent 9bb3c44 commit 1ebfd10
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/block/rsxx/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,6 @@ static void rsxx_pci_remove(struct pci_dev *dev)
rsxx_disable_ier_and_isr(card, CR_INTR_EVENT);
spin_unlock_irqrestore(&card->irq_lock, flags);

/* Prevent work_structs from re-queuing themselves. */
card->halt = 1;

cancel_work_sync(&card->event_work);

rsxx_destroy_dev(card);
Expand All @@ -549,6 +546,10 @@ static void rsxx_pci_remove(struct pci_dev *dev)
spin_lock_irqsave(&card->irq_lock, flags);
rsxx_disable_ier_and_isr(card, CR_INTR_ALL);
spin_unlock_irqrestore(&card->irq_lock, flags);

/* Prevent work_structs from re-queuing themselves. */
card->halt = 1;

free_irq(dev->irq, card);

if (!force_legacy)
Expand Down

0 comments on commit 1ebfd10

Please sign in to comment.