1 From 4791194922d8ab361136d462a23e897b459d1a2a Mon Sep 17 00:00:00 2001
2 From: Vincent Sanders <vincent.sanders@collabora.co.uk>
3 Date: Mon, 30 Sep 2013 17:04:55 +0100
4 Subject: [PATCH 109/196] vchiq: fix the shim message release
6 Signed-off-by: Daniel Stone <daniels@collabora.com>
8 .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 47 +++++++++++++---------
9 1 file changed, 29 insertions(+), 18 deletions(-)
11 diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
12 index f752f8d..fe9bd80 100644
13 --- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
14 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
15 @@ -545,47 +545,58 @@ static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,
16 SHIM_SERVICE_T *service =
17 (SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA(handle);
19 + if (!service->callback)
23 case VCHIQ_MESSAGE_AVAILABLE:
24 vchiu_queue_push(&service->queue, header);
26 - if (service->callback)
27 - service->callback(service->callback_param,
28 - VCHI_CALLBACK_MSG_AVAILABLE, NULL);
29 + service->callback(service->callback_param,
30 + VCHI_CALLBACK_MSG_AVAILABLE, NULL);
35 case VCHIQ_BULK_TRANSMIT_DONE:
36 - if (service->callback)
37 - service->callback(service->callback_param,
38 - VCHI_CALLBACK_BULK_SENT, bulk_user);
39 + service->callback(service->callback_param,
40 + VCHI_CALLBACK_BULK_SENT, bulk_user);
43 case VCHIQ_BULK_RECEIVE_DONE:
44 - if (service->callback)
45 - service->callback(service->callback_param,
46 - VCHI_CALLBACK_BULK_RECEIVED, bulk_user);
47 + service->callback(service->callback_param,
48 + VCHI_CALLBACK_BULK_RECEIVED, bulk_user);
51 case VCHIQ_SERVICE_CLOSED:
52 - if (service->callback)
53 - service->callback(service->callback_param,
54 - VCHI_CALLBACK_SERVICE_CLOSED, NULL);
55 + service->callback(service->callback_param,
56 + VCHI_CALLBACK_SERVICE_CLOSED, NULL);
59 case VCHIQ_SERVICE_OPENED:
60 /* No equivalent VCHI reason */
63 case VCHIQ_BULK_TRANSMIT_ABORTED:
64 - if (service->callback)
65 - service->callback(service->callback_param,
66 - VCHI_CALLBACK_BULK_TRANSMIT_ABORTED, bulk_user);
67 + service->callback(service->callback_param,
68 + VCHI_CALLBACK_BULK_TRANSMIT_ABORTED,
72 case VCHIQ_BULK_RECEIVE_ABORTED:
73 - if (service->callback)
74 - service->callback(service->callback_param,
75 - VCHI_CALLBACK_BULK_RECEIVE_ABORTED, bulk_user);
76 + service->callback(service->callback_param,
77 + VCHI_CALLBACK_BULK_RECEIVE_ABORTED,
82 WARN(1, "not supported\n");
87 + vchiq_release_message(service->handle, header);