aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-04-23 17:57:05 +0100
committerJon Medhurst <tixy@linaro.org>2015-04-23 17:57:05 +0100
commitfc16624b83ef66420cbee93deffcc84afbc61781 (patch)
treeea6dc5c303db17bd99772734fe46642de4c4773b
parent18da101d4aa62e3e7f8caa0cac21fe612aeb090d (diff)
parentdd417ebc39be5ef40a400d083230e6980dc8effa (diff)
Merge branch 'lsk-3.10-armlt-scpi-new' into integration-lsk-3.10-juno-android-newlsk-3.10-armlt-juno-20150423
-rw-r--r--drivers/mailbox/scpi_protocol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/scpi_protocol.c b/drivers/mailbox/scpi_protocol.c
index 27b38fefbf2e..17b362598e81 100644
--- a/drivers/mailbox/scpi_protocol.c
+++ b/drivers/mailbox/scpi_protocol.c
@@ -460,7 +460,7 @@ static unsigned long scpi_clk_get_val(u16 clk_id)
static int scpi_clk_set_val(u16 clk_id, unsigned long rate)
{
int stat;
- struct clk_set_value clk = { cpu_to_le16(clk_id), cpu_to_le32(rate) };
+ struct clk_set_value clk = { cpu_to_le16(clk_id), 0, cpu_to_le32(rate) };
return scpi_send_message(SCPI_CMD_SET_CLOCK_VALUE,
&clk, sizeof(clk), &stat);