evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am437x-vfpe: fix typo in vpfe_get_app_input_index

Browse source 
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: d37232390f ("[media] media: am437x-vpfe: match the OF node/i2c addr instead of name")

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2016-03-14 19:40:08 -03:00 • committed by Greg Kroah-Hartman
parent c48692f59b
commit 7fb33fb721
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/platform/am437x/am437x-vpfe.c
View file

@ -1706,7 +1706,7 @@ static int vpfe_get_app_input_index(struct vpfe_device *vpfe,
sdinfo = &cfg->sub_devs[i]; sdinfo = &cfg->sub_devs[i];
client = v4l2_get_subdevdata(sdinfo->sd); client = v4l2_get_subdevdata(sdinfo->sd);
if (client->addr == curr_client->addr && if (client->addr == curr_client->addr &&
client->adapter->nr == client->adapter->nr) { client->adapter->nr == curr_client->adapter->nr) {
if (vpfe->current_input >= 1) if (vpfe->current_input >= 1)
return -1; return -1;
*app_input_index = j + vpfe->current_input; *app_input_index = j + vpfe->current_input;