summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/function/f_loopback.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-12-19 12:13:02 +0100
committerThomas Gleixner <tglx@linutronix.de>2015-12-19 12:13:02 +0100
commitef0bf620e9b81845368b9c72ffdbd6834e424526 (patch)
tree7862e4ca1aa61a20f8e11502276b7f8633a39aa4 /drivers/usb/gadget/function/f_loopback.c
parent425a5072dcd1bd895eea90a6b495392b6358ebd0 (diff)
parenta6c2f87b8820e956ea0f731dcf0e45949bb37a8b (diff)
downloadlwn-ef0bf620e9b81845368b9c72ffdbd6834e424526.tar.gz
lwn-ef0bf620e9b81845368b9c72ffdbd6834e424526.zip
Merge branch 'irq/wire-msi-bridge' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the MSI wire bridge implementation from Marc Zyngier along with the first user of it. This is infrastructure to support a wired interrupt to MSI interrupt brigde. The first user is mbigen found in Hisilicon ARM SoCs.
Diffstat (limited to 'drivers/usb/gadget/function/f_loopback.c')
-rw-r--r--drivers/usb/gadget/function/f_loopback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index 23933bdf2d9d..ddc3aad886b7 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -329,7 +329,7 @@ static int alloc_requests(struct usb_composite_dev *cdev,
for (i = 0; i < loop->qlen && result == 0; i++) {
result = -ENOMEM;
- in_req = usb_ep_alloc_request(loop->in_ep, GFP_KERNEL);
+ in_req = usb_ep_alloc_request(loop->in_ep, GFP_ATOMIC);
if (!in_req)
goto fail;