summaryrefslogtreecommitdiffstats
path: root/net/strparser/strparser.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-01 01:42:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-01 01:42:04 -0400
commit8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905 (patch)
tree26a36ec23067a9e26baf3d46c65f70619ca4d808 /net/strparser/strparser.c
parent4d537f37e0d39f64687be71087dca607ee507f5a (diff)
parent79a3aaa7b82e3106be97842dedfd8429248896e6 (diff)
Merge 5.1-rc3 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/strparser/strparser.c')
-rw-r--r--net/strparser/strparser.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index da1a676860ca..860dcfb95ee4 100644
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -550,6 +550,8 @@ EXPORT_SYMBOL_GPL(strp_check_rcv);
550static int __init strp_mod_init(void) 550static int __init strp_mod_init(void)
551{ 551{
552 strp_wq = create_singlethread_workqueue("kstrp"); 552 strp_wq = create_singlethread_workqueue("kstrp");
553 if (unlikely(!strp_wq))
554 return -ENOMEM;
553 555
554 return 0; 556 return 0;
555} 557}