UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: move operation timeout teardown 

Move the cancel_delayed_work() call so it's done separate from the
removing the operation from the pending list.

This should have been part of this commit:
    d3809f7 greybus: move timeout out of gb_operation_insert()

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
This commit is contained in:
Alex Elder 2014-11-17 08:08:36 -06:00 committed by Greg Kroah-Hartman
parent b4be404352
commit 19363a2ca1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/greybus/operation.c
View File

@ -79,9 +79,6 @@ static void gb_pending_operation_remove(struct gb_operation *operation)
{
struct gb_connection *connection = operation->connection;
/* Shut down our timeout timer */
cancel_delayed_work(&operation->timeout_work);
/* Take us off of the list of pending operations */
spin_lock_irq(&gb_operations_lock);
list_move_tail(&operation->links, &connection->operations);
@ -439,6 +436,7 @@ void gb_connection_operation_recv(struct gb_connection *connection,
gb_connection_err(connection, "operation not found");
return;
}
cancel_delayed_work(&operation->timeout_work);
gb_pending_operation_remove(operation);
gbuf = operation->response;
gbuf->status = GB_OP_SUCCESS; /* If we got here we're good */