evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: glink: Modify glink logging in tx_common"

Browse source
This commit is contained in:
Linux Build Service Account 2018-01-09 15:40:25 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9c7f12cde2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/soc/qcom/glink.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -2991,7 +2991,7 @@ static int glink_tx_common(void *handle, void *pkt_priv,
if (!wait_for_completion_timeout( if (!wait_for_completion_timeout(
&ctx->int_req_ack_complete, &ctx->int_req_ack_complete,
ctx->rx_intent_req_timeout_jiffies)) { ctx->rx_intent_req_timeout_jiffies)) {
GLINK_ERR_CH(ctx, GLINK_ERR(
"%s: Intent request ack with size: %zu not granted for lcid\n", "%s: Intent request ack with size: %zu not granted for lcid\n",
__func__, size); __func__, size);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
@ -3011,7 +3011,7 @@ static int glink_tx_common(void *handle, void *pkt_priv,
if (!wait_for_completion_timeout( if (!wait_for_completion_timeout(
&ctx->int_req_complete, &ctx->int_req_complete,
ctx->rx_intent_req_timeout_jiffies)) { ctx->rx_intent_req_timeout_jiffies)) {
GLINK_ERR_CH(ctx, GLINK_ERR(
"%s: Intent request with size: %zu not granted for lcid\n", "%s: Intent request with size: %zu not granted for lcid\n",
__func__, size); __func__, size);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;