target/linux/brcm2708/patches-3.10/0109-vchiq-fix-the-shim-message-release.patch

   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
   5
   6 Signed-off-by: Daniel Stone <daniels@collabora.com>
   7 ---
   8  .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 47 +++++++++++++---------
   9  1 file changed, 29 insertions(+), 18 deletions(-)
  10
  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);
  18
  19 +        if (!service->callback)
  20 +               goto release;
  21 +
  22         switch (reason) {
  23         case VCHIQ_MESSAGE_AVAILABLE:
  24                 vchiu_queue_push(&service->queue, header);
  25
  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);
  31 +
  32 +               goto done;
  33                 break;
  34 +
  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);
  41                 break;
  42 +
  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);
  49                 break;
  50 +
  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);
  57                 break;
  58 +
  59         case VCHIQ_SERVICE_OPENED:
  60                 /* No equivalent VCHI reason */
  61                 break;
  62 +
  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,
  69 +                                 bulk_user);
  70                 break;
  71 +
  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,
  78 +                                 bulk_user);
  79                 break;
  80 +
  81         default:
  82                 WARN(1, "not supported\n");
  83                 break;
  84         }
  85
  86 +release:
  87 +        vchiq_release_message(service->handle, header);
  88 +done:
  89         return VCHIQ_SUCCESS;
  90  }
  91
  92 --
  93 1.9.1
  94