diff options
| author |   Jia-Ju Bai <baijiaju1990@163.com> | 2017-10-09 16:45:55 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-18 16:42:28 +0200 |
| commit | 42c8eb3f6e15367981b274cb79ee4657e2c6949d (patch) | |
| tree | c687e6cb40d2ba1078f014355302efacd38722fd /drivers/staging/vt6655 | |
| parent | Staging: bcm2048 fix bare use of 'unsigned' in radio-bcm2048.c (diff) | |
| download | linux-dev-42c8eb3f6e15367981b274cb79ee4657e2c6949d.tar.xz linux-dev-42c8eb3f6e15367981b274cb79ee4657e2c6949d.zip | |
vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend
The driver may sleep under a spinlock, and the function call path is:
vt6655_suspend (acquire the spinlock)
pci_set_power_state
__pci_start_power_transition (drivers/pci/pci.c)
msleep --> may sleep
To fix it, pci_set_power_state is called without having a spinlock.
This bug is found by my static analysis tool and my code review.
Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 9fcf2e223f71..1123b4f1e1d6 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1693,10 +1693,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state) MACbShutdown(priv); pci_disable_device(pcid); - pci_set_power_state(pcid, pci_choose_state(pcid, state)); spin_unlock_irqrestore(&priv->lock, flags); + pci_set_power_state(pcid, pci_choose_state(pcid, state)); + return 0; } |