aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRupesh Gujare <rgujare@ozmodevices.com>2012-06-20 13:36:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-20 16:05:35 -0700
commitfec9f24b6269dc5fb4b1212a970c089461ec7ff2 (patch)
tree209f8ef267a9930d787fc3977dbb6ffeaf48d588
parentdf49093ae499882cb9cfb29f80f6abb10ae51d74 (diff)
staging: ozwpan: kmalloc flag
Pass right flag as memory is assigned in process context. Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/ozwpan/ozproto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c
index 502e18a6675..a50ab18a598 100644
--- a/drivers/staging/ozwpan/ozproto.c
+++ b/drivers/staging/ozwpan/ozproto.c
@@ -794,7 +794,7 @@ void oz_binding_add(char *net_dev)
{
struct oz_binding *binding;
- binding = kmalloc(sizeof(struct oz_binding), GFP_ATOMIC);
+ binding = kmalloc(sizeof(struct oz_binding), GFP_KERNEL);
if (binding) {
binding->ptype.type = __constant_htons(OZ_ETHERTYPE);
binding->ptype.func = oz_pkt_recv;