]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
rsxx: add missed destroy_workqueue calls in remove
authorChuhong Yuan <hslester96@gmail.com>
Wed, 13 Nov 2019 06:38:47 +0000 (14:38 +0800)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:22:02 +0000 (14:22 -0300)
BugLink: https://bugs.launchpad.net/bugs/1857158
[ Upstream commit dcb77e4b274b8f13ac6482dfb09160cd2fae9a40 ]

The driver misses calling destroy_workqueue in remove like what is done
when probe fails.
Add the missed calls to fix it.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/block/rsxx/core.c

index 34997df132e240be4bcebedcf0df6c6baaf39907..6beafaa335c71f2681664782be8e494b44f44003 100644 (file)
@@ -1025,8 +1025,10 @@ static void rsxx_pci_remove(struct pci_dev *dev)
 
        cancel_work_sync(&card->event_work);
 
+       destroy_workqueue(card->event_wq);
        rsxx_destroy_dev(card);
        rsxx_dma_destroy(card);
+       destroy_workqueue(card->creg_ctrl.creg_wq);
 
        spin_lock_irqsave(&card->irq_lock, flags);
        rsxx_disable_ier_and_isr(card, CR_INTR_ALL);