aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2016-03-01 16:40:10 -0800
committerGreg Kroah-Hartman2016-03-01 16:40:10 -0800
commitf4f41c5abcf9acc61939367dc80fd62d19b16edb (patch)
tree46e8db084793f1b19324926dd0fd8241b977674f /drivers
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff)
parentd144dfea8af7108f613139623e63952ed7e69c0c (diff)
Merge tag 'usb-ci-v4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus
Peter writes: One bug-fix using ID wakeup, this bug is existed once this driver has written.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/chipidea/otg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index 45f86da1d6d3..03b6743461d1 100644
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -158,7 +158,7 @@ static void ci_otg_work(struct work_struct *work)
int ci_hdrc_otg_init(struct ci_hdrc *ci)
{
INIT_WORK(&ci->work, ci_otg_work);
- ci->wq = create_singlethread_workqueue("ci_otg");
+ ci->wq = create_freezable_workqueue("ci_otg");
if (!ci->wq) {
dev_err(ci->dev, "can't create workqueue\n");
return -ENODEV;