summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJia-Ju Bai <baijiaju1990@163.com>2017-10-09 11:45:55 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-18 17:42:28 +0300
commit42c8eb3f6e15367981b274cb79ee4657e2c6949d (patch)
treec687e6cb40d2ba1078f014355302efacd38722fd /drivers
parent6e047ac922d8dd1293bdb9778bf2f2c0d699e9c6 (diff)
downloadlinux-42c8eb3f6e15367981b274cb79ee4657e2c6949d.tar.xz
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')
-rw-r--r--drivers/staging/vt6655/device_main.c3
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;
}