diff options
| author |   Ron Mercer <ron.mercer@qlogic.com> | 2010-12-11 11:06:50 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-12-12 15:02:57 -0800 |
| commit | 4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87 (patch) | |
| tree | 0af7a055a47899bd8a6475e182628b5fb1daa5b2 /drivers/net/qlge/qlge_main.c | |
| parent | Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| download | linux-dev-4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87.tar.xz linux-dev-4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87.zip | |
qlge: Fix deadlock when cancelling worker.
Removing usage of rtnl_lock() to protect firmware interface registers.
These registers are accessed in some worker threads and can create a
deadlock if rtnl_lock is taken by upper layers while the worker is still
pending.
We remove rtnl_lock and use a driver mutex just while mailboxes are
accessed.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 528eaef5308f..2555b1d34f34 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -4629,6 +4629,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, INIT_DELAYED_WORK(&qdev->mpi_idc_work, ql_mpi_idc_work); INIT_DELAYED_WORK(&qdev->mpi_core_to_log, ql_mpi_core_to_log); init_completion(&qdev->ide_completion); + mutex_init(&qdev->mpi_mutex); if (!cards_found) { dev_info(&pdev->dev, "%s\n", DRV_STRING); |