git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-v4.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
drm_scdc_helper.c
diff --git
a/drivers/gpu/drm/drm_scdc_helper.c
b/drivers/gpu/drm/drm_scdc_helper.c
index 7d1b0f011d33e1d796890bb71c88458b0ae6d054..935653eb3616c997064fb166cb0d1ce8e839e4b7 100644
(file)
--- a/
drivers/gpu/drm/drm_scdc_helper.c
+++ b/
drivers/gpu/drm/drm_scdc_helper.c
@@
-102,7
+102,7
@@
ssize_t drm_scdc_write(struct i2c_adapter *adapter, u8 offset,
void *data;
int err;
- data = kmalloc(1 + size, GFP_
TEMPORARY
);
+ data = kmalloc(1 + size, GFP_
KERNEL
);
if (!data)
return -ENOMEM;