| Message ID | 1457995225-1199991-3-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3,media] cobalt: add MTD dependency | expand |
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c index 2a7b79bc90fd..2228cd3a846e 100644 --- a/drivers/media/v4l2-core/v4l2-mc.c +++ b/drivers/media/v4l2-core/v4l2-mc.c @@ -34,7 +34,7 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) { struct media_entity *entity; struct media_entity *if_vid = NULL, *if_aud = NULL; - struct media_entity *tuner = NULL, *decoder = NULL, *dtv_demod = NULL; + struct media_entity *tuner = NULL, *decoder = NULL; struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL; bool is_webcam = false; u32 flags;
A recent patch removed the only user of the 'dtv_demod' variable in v4l2_mc_create_media_graph, but did not remove the declaration, possibly as a result of an incorrect rebase: drivers/media/v4l2-core/v4l2-mc.c: In function 'v4l2_mc_create_media_graph': drivers/media/v4l2-core/v4l2-mc.c:37:55: error: unused variable 'dtv_demod' [-Werror=unused-variable] This removes the unused variable as well. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 840f5b0572ea ("media: au0828 disable tuner to demod link in au0828_media_device_register()") --- drivers/media/v4l2-core/v4l2-mc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0