Commit d41a83b4 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kamal Mostafa

am437x-vfpe: fix typo in vpfe_get_app_input_index

commit 0fb50400 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: d3723239 ("[media] media: am437x-vpfe: match the OF node/i2c addr instead of name")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 2e4bc793
...@@ -1705,7 +1705,7 @@ static int vpfe_get_app_input_index(struct vpfe_device *vpfe, ...@@ -1705,7 +1705,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment