diff mbox series

[BlueZ] shared/vcp: fix setting volume back to current value

Message ID 11cdbf4619d9eda9cd40c84728a2f5cc87d42d2e.1739720857.git.pav@iki.fi
State New
Headers show
Series [BlueZ] shared/vcp: fix setting volume back to current value | expand

Commit Message

Pauli Virtanen Feb. 16, 2025, 3:48 p.m. UTC
If there is a volume change request in flight, always update pending
volume. Otherwise, setting the value back to old value before
notification arrives, is wrongly ignored.

Fixes: e77884accdb2 ("shared/vcp: have only one volume change in flight at a time")
---
 src/shared/vcp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

bluez.test.bot@gmail.com Feb. 16, 2025, 5:09 p.m. UTC | #1
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=934417

---Test result---

Test Summary:
CheckPatch                    PENDING   0.20 seconds
GitLint                       PENDING   0.26 seconds
BuildEll                      PASS      20.33 seconds
BluezMake                     PASS      1421.94 seconds
MakeCheck                     PASS      12.89 seconds
MakeDistcheck                 PASS      157.70 seconds
CheckValgrind                 PASS      213.80 seconds
CheckSmatch                   PASS      284.91 seconds
bluezmakeextell               PASS      97.26 seconds
IncrementalBuild              PENDING   0.25 seconds
ScanBuild                     PASS      861.49 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org Feb. 19, 2025, 8:30 p.m. UTC | #2
Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Sun, 16 Feb 2025 17:48:54 +0200 you wrote:
> If there is a volume change request in flight, always update pending
> volume. Otherwise, setting the value back to old value before
> notification arrives, is wrongly ignored.
> 
> Fixes: e77884accdb2 ("shared/vcp: have only one volume change in flight at a time")
> ---
>  src/shared/vcp.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Here is the summary with links:
  - [BlueZ] shared/vcp: fix setting volume back to current value
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=65fbc47143a5

You are awesome, thank you!
diff mbox series

Patch

diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index f0887ad62..321686774 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -2119,15 +2119,15 @@  static bool vcp_set_volume_client(struct bt_vcp *vcp, uint8_t volume)
 	 * the current one completes. This may skip over some volume changes,
 	 * as it only sends a request for the final value.
 	 */
-	if (vcp->volume == volume) {
+	if (vcp->pending_op.timeout_id) {
+		vcp->pending_op.volume = volume;
+		vcp->pending_op.resend = true;
+		return true;
+	} else if (vcp->volume == volume) {
 		/* Do not set to current value, as that doesn't generate
 		 * a notification
 		 */
 		return true;
-	} else if (vcp->pending_op.timeout_id) {
-		vcp->pending_op.volume = volume;
-		vcp->pending_op.resend = true;
-		return true;
 	}
 
 	req.op = BT_VCS_SET_ABSOLUTE_VOL;