A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

wigig_sensing: return error code after change_mode failure

Browse source 
change_mode command sometimes fail. In such a case, a proper error code
should be returned to the calling user space application. Otherwise, the
application tries to read data, which is not available.

Change-Id: I03778cace54fd98847a099bbeaf7884cfbaac586
Signed-off-by: Gidon Studinski <[email protected]>
Signed-off-by: Alexei Avshalom Lazar <[email protected]>
This commit is contained in:
Gidon Studinski 2019-11-19 12:34:14 +02:00 • committed by Alexei Avshalom Lazar
commit 813b74096e
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/misc/wigig_sensing.c
View file

@ -546,7 +546,8 @@ static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx,
int rc;
u32 ch;
pr_info("mode = %d, channel = %d\n", req.mode, req.channel);
pr_info("mode = %d, channel = %d, has_channel = %d\n",
req.mode, req.channel, req.has_channel);
if (!ctx)
return -EINVAL;
@ -583,12 +584,13 @@ static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx,
/* Interrupted by a signal */
pr_err("wait_event_interruptible_timeout() interrupted by a signal (%d)\n",
rc);
return rc;
goto End;
}
if (rc == 0) {
/* Timeout, FW did not respond in time */
pr_err("wait_event_interruptible_timeout() timed out\n");
return -ETIME;
rc = -ETIME;
goto End;
}
/* Change internal state */
@ -605,7 +607,8 @@ static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx,
ctx->stm.change_mode_in_progress = false;
End:
return ctx->stm.burst_size;
ctx->stm.change_mode_in_progress = false;
return (rc == 0) ? ctx->stm.burst_size : rc;
}
static int wigig_sensing_ioc_clear_data(struct wigig_sensing_ctx *ctx)