diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 3392b425a6c2..7adfa6346288 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -846,8 +846,8 @@ void gb_operation_cancel(struct gb_operation *operation, int errno)
 		gb_message_cancel(operation->request);
 		if (operation->response)
 			gb_message_cancel(operation->response);
+		gb_operation_put(operation);
 	}
-	gb_operation_put(operation);
 }
 EXPORT_SYMBOL_GPL(gb_operation_cancel);