aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-05 00:15:06 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-05 00:15:06 -0800
commit191fd920cb0361f41f3c514ca7a7f0c9a8999b33 (patch)
tree696107947bb1eb3f4905ae1542865946faa0a306
parentfa9a1796f0cdd5eb7e3c708d34dd63bd3f4ad085 (diff)
parent03fddcb20d6bcd25083b9bb7d53e8661ee65d514 (diff)
Merge "mhi: rmnet: Enabled sanity check for LPM IOCTL" into LA.BF.2.1_rb1.2
-rw-r--r--drivers/net/ethernet/msm/msm_rmnet_mhi.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/ethernet/msm/msm_rmnet_mhi.c b/drivers/net/ethernet/msm/msm_rmnet_mhi.c
index c168f39859e..4e5ba41bc8f 100644
--- a/drivers/net/ethernet/msm/msm_rmnet_mhi.c
+++ b/drivers/net/ethernet/msm/msm_rmnet_mhi.c
@@ -650,7 +650,15 @@ static int rmnet_mhi_ioctl_extended(struct net_device *dev, struct ifreq *ifr)
sizeof(ext_cmd.u.if_name));
break;
case RMNET_IOCTL_SET_SLEEP_STATE:
- mhi_set_lpm(rmnet_mhi_ptr->tx_client_handle, ext_cmd.u.data);
+ if (rmnet_mhi_ptr->mhi_enabled &&
+ rmnet_mhi_ptr->tx_client_handle != NULL) {
+ mhi_set_lpm(rmnet_mhi_ptr->tx_client_handle,
+ ext_cmd.u.data);
+ } else {
+ rmnet_log(MSG_ERROR,
+ "Cannot set LPM value, MHI is not up.\n");
+ return -ENODEV;
+ }
break;
default:
rc = -EINVAL;