Skip to contentSkip to conversation

Patch "[media] am437x-vfpe: fix typo in vpfe_get_app_input_index" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 26, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

[media] am437x-vfpe: fix typo in vpfe_get_app_input_index

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
am437x-vfpe-fix-typo-in-vpfe_get_app_input_index.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0fb504001192c1df62c847a8bb6558753c36ebef Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Mon, 14 Mar 2016 19:40:08 -0300
Subject: [media] am437x-vfpe: fix typo in vpfe_get_app_input_index

From: Arnd Bergmann <[email protected]>

commit 0fb504001192c1df62c847a8bb6558753c36ebef upstream.

gcc-6 points out an obviously silly comparison in vpfe_get_app_input_index():

drivers/media/platform/am437x/am437x-vpfe.c: In function 'vpfe_get_app_input_index':
drivers/media/platform/am437x/am437x-vpfe.c:1709:27: warning: self-comparison always evaluats to true [-Wtautological-compare]

       client->adapter->nr == client->adapter->nr) {
                           ^~

This was introduced in a slighly incorrect conversion, and it's clear that the comparison was meant to compare the iterator to the current subdev instead, as we do in the line above.

Fixes d37232390fd4 ("[media] media: am437x-vpfe: match the OF node/i2c addr instead of name")
---
 drivers/media/platform/am437x/am437x-vpfe.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/am437x/am437x-vpfe.c +1 -1
@@ -1706,7 +1706,7 @@ static int vpfe_get_app_input_index(stru
 		sdinfo = &cfg->sub_devs[i];
 		client = v4l2_get_subdevdata(sdinfo->sd);
 		if (client->addr == curr_client->addr &&
-		    client->adapter->nr == client->adapter->nr) {
+		    client->adapter->nr == curr_client->adapter->nr) {
 			if (vpfe->current_input >= 1)
 				return -1;
 			*app_input_index = j + vpfe->current_input;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/include-linux-kernel.h-change-abs-macro-so-it-uses-consistent-return-type.patch queue-4.4/ath9k-fix-misleading-indentation.patch queue-4.4/iwlegacy-avoid-warning-about-missing-braces.patch queue-4.4/kbuild-disable-maybe-uninitialized-warning-for-config_profile_all_branches.patch queue-4.4/net-caif-fix-misleading-indentation.patch queue-4.4/nouveau-fix-nv40_perfctr_next-cleanup-regression.patch queue-4.4/gcov-disable-wmaybe-uninitialized-warning.patch queue-4.4/am437x-vfpe-fix-typo-in-vpfe_get_app_input_index.patch queue-4.4/fix-build-warning-in-kernel-cpuset.c.patch queue-4.4/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch