samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge a4c719e3cd on remote branch

Browse Source 
Change-Id: Ieba828b77a5932f1613a8aeb4952b0cdd4835e8a
This commit is contained in:
Linux Build Service Account
2024-07-08 03:52:51 -07:00
parent 6c823688ac a4c719e3cd
commit 0edbf1a122
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/spcom.c
View File

@@ -33,8 +33,8 @@
* to use a dedicated logical channel for HLOS and SP Application-Pair. * to use a dedicated logical channel for HLOS and SP Application-Pair.
* *
* Each HLOS/SP Application can be either Client or Server or both, * Each HLOS/SP Application can be either Client or Server or both,
* Messaging is allways point-to-point between 2 HLOS<=>SP applications. * Messaging is always point-to-point between 2 HLOS<=>SP applications.
* Each channel exclusevly used by single Client or Server. * Each channel exclusively used by single Client or Server.
* *
* User Space Request & Response are synchronous. * User Space Request & Response are synchronous.
* read() & write() operations are blocking until completed or terminated. * read() & write() operations are blocking until completed or terminated.
@@ -524,10 +524,10 @@ static int spcom_rx(struct spcom_channel *ch,
mutex_unlock(&ch->lock); /* unlock while waiting */ mutex_unlock(&ch->lock); /* unlock while waiting */
/* wait for rx response */ /* wait for rx response */
if (timeout_msec) if (timeout_msec)
timeleft = wait_for_completion_interruptible_timeout( timeleft = wait_for_completion_killable_timeout(
&ch->rx_done, jiffies); &ch->rx_done, jiffies);
else else
ret = wait_for_completion_interruptible(&ch->rx_done); ret = wait_for_completion_killable(&ch->rx_done);
mutex_lock(&ch->lock); mutex_lock(&ch->lock);
if (timeout_msec && timeleft == 0) { if (timeout_msec && timeleft == 0) {
@@ -541,7 +541,7 @@ static int spcom_rx(struct spcom_channel *ch,
ret = -ERESTART; ret = -ERESTART;
goto exit_err; goto exit_err;
} else if (ret < 0 || timeleft < 0) { } else if (ret < 0 || timeleft < 0) {
spcom_pr_err("rx wait was interrupted!"); spcom_pr_err("rx wait was interrupted! PID: %d", current_pid());
ret = -EINTR; /* abort, not restartable */ ret = -EINTR; /* abort, not restartable */
goto exit_err; goto exit_err;
} else if (ch->actual_rx_size) { } else if (ch->actual_rx_size) {
@@ -3038,8 +3038,8 @@ static int spcom_ioctl_handle_poll_event(struct spcom_ioctl_poll_event *arg, int
&spcom_dev->rpmsg_state_change); &spcom_dev->rpmsg_state_change);
if (ret) {/* wait was interrupted */ if (ret) {/* wait was interrupted */
spcom_pr_info("Wait for link state change interrupted, ret[%d]\n", spcom_pr_info("Wait for link state change interrupted, ret[%d], pid: %d\n",
ret); ret, current_pid());
return -EINTR; return -EINTR;
} }
} }