summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/greybus')
-rw-r--r--drivers/staging/greybus/operation.c12
-rw-r--r--drivers/staging/greybus/operation.h3
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 4019b03..eee315c 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -129,7 +129,7 @@ gb_operation_find(struct gb_connection *connection, u16 operation_id)
return found ? operation : NULL;
}
-static int gb_message_send(struct gb_message *message)
+static int gb_message_send(struct gb_message *message, gfp_t gfp)
{
struct gb_connection *connection = message->operation->connection;
@@ -563,7 +563,8 @@ static void gb_operation_sync_callback(struct gb_operation *operation)
* dropping the initial reference to the operation.
*/
int gb_operation_request_send(struct gb_operation *operation,
- gb_operation_callback callback)
+ gb_operation_callback callback,
+ gfp_t gfp)
{
struct gb_connection *connection = operation->connection;
struct gb_operation_msg_hdr *header;
@@ -601,7 +602,7 @@ int gb_operation_request_send(struct gb_operation *operation,
/* All set, send the request */
gb_operation_result_set(operation, -EINPROGRESS);
- ret = gb_message_send(operation->request);
+ ret = gb_message_send(operation->request, gfp);
if (ret)
gb_operation_put(operation);
@@ -620,7 +621,8 @@ int gb_operation_request_send_sync(struct gb_operation *operation)
int ret;
unsigned long timeout;
- ret = gb_operation_request_send(operation, gb_operation_sync_callback);
+ ret = gb_operation_request_send(operation, gb_operation_sync_callback,
+ GFP_KERNEL);
if (ret)
return ret;
@@ -677,7 +679,7 @@ int gb_operation_response_send(struct gb_operation *operation, int errno)
/* Fill in the response header and send it */
operation->response->header->result = gb_operation_errno_map(errno);
- ret = gb_message_send(operation->response);
+ ret = gb_message_send(operation->response, GFP_KERNEL);
if (ret)
gb_operation_put(operation);
diff --git a/drivers/staging/greybus/operation.h b/drivers/staging/greybus/operation.h
index 3956648..4063223 100644
--- a/drivers/staging/greybus/operation.h
+++ b/drivers/staging/greybus/operation.h
@@ -147,7 +147,8 @@ bool gb_operation_response_alloc(struct gb_operation *operation,
size_t response_size);
int gb_operation_request_send(struct gb_operation *operation,
- gb_operation_callback callback);
+ gb_operation_callback callback,
+ gfp_t gfp);
int gb_operation_request_send_sync(struct gb_operation *operation);
int gb_operation_response_send(struct gb_operation *operation, int errno);
OpenPOWER on IntegriCloud