Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux-2.6-block.git] / drivers / rpmsg / qcom_glink_native.c

diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index f46c787733e8ac6ac63cf5eca85a40cad0665272..621f1afd4d6b159c761700d2a3a2c4380a169260 100644 (file)
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -892,7 +892,7 @@ static void qcom_glink_handle_intent(struct qcom_glink *glink,
                struct intent_pair intents[];
        } __packed * msg;
 
-       const size_t msglen = sizeof(*msg) + sizeof(struct intent_pair) * count;
+       const size_t msglen = struct_size(msg, intents, count);
        int ret;
        int i;
        unsigned long flags;