projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
firewire
/
core-cdev.c
diff --git
a/drivers/firewire/core-cdev.c
b/drivers/firewire/core-cdev.c
index 2a3973a7c44179457f635196696bc78e756a76e1..36a7c2d89a010e7a567224c89a01a2ebe0c8fd20 100644
(file)
--- a/
drivers/firewire/core-cdev.c
+++ b/
drivers/firewire/core-cdev.c
@@
-486,7
+486,7
@@
static int ioctl_get_info(struct client *client, union ioctl_arg *arg)
static int add_client_resource(struct client *client,
struct client_resource *resource, gfp_t gfp_mask)
{
- bool preload =
!!(gfp_mask & __GFP_WAIT
);
+ bool preload =
gfpflags_allow_blocking(gfp_mask
);
unsigned long flags;
int ret;