projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usb-serial-5.15-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
watchdog
/
pcwd_usb.c
diff --git
a/drivers/watchdog/pcwd_usb.c
b/drivers/watchdog/pcwd_usb.c
index
41a928e
..
1bdaf17
100644
(file)
--- a/
drivers/watchdog/pcwd_usb.c
+++ b/
drivers/watchdog/pcwd_usb.c
@@
-656,7
+656,7
@@
static int usb_pcwd_probe(struct usb_interface *interface,
/* set up the memory buffer's */
usb_pcwd->intr_buffer = usb_alloc_coherent(udev, usb_pcwd->intr_size,
- GFP_
ATOMIC
, &usb_pcwd->intr_dma);
+ GFP_
KERNEL
, &usb_pcwd->intr_dma);
if (!usb_pcwd->intr_buffer) {
pr_err("Out of memory\n");
goto error;