[PATCH] media: vidtv: fix some warnings

[Mauro Carvalho Chehab]

As reported by sparse:

        drivers/media/test-drivers/vidtv/vidtv_ts.h:47:47: warning: array of 
flexible structures
        drivers/media/test-drivers/vidtv/vidtv_channel.c:458:54: warning: 
incorrect type in argument 3 (different base types)
        drivers/media/test-drivers/vidtv/vidtv_channel.c:458:54:    expected 
unsigned short [usertype] service_id
        drivers/media/test-drivers/vidtv/vidtv_channel.c:458:54:    got 
restricted __be16 [usertype] service_id
        drivers/media/test-drivers/vidtv/vidtv_s302m.c:471 
vidtv_s302m_encoder_init() warn: possible memory leak of 'e'

Address such warnings.

Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
---
 drivers/media/test-drivers/vidtv/vidtv_psi.h   | 2 +-
 drivers/media/test-drivers/vidtv/vidtv_s302m.c | 4 +++-
 drivers/media/test-drivers/vidtv/vidtv_ts.h    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h 
b/drivers/media/test-drivers/vidtv/vidtv_psi.h
index 340c9fb8d583..d9c71f88ab9e 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h
@@ -743,7 +743,7 @@ struct vidtv_psi_table_eit {
 struct vidtv_psi_table_eit
 *vidtv_psi_eit_table_init(u16 network_id,
                          u16 transport_stream_id,
-                         u16 service_id);
+                         __be16 service_id);
 
 /**
  * struct vidtv_psi_eit_write_args - Arguments for writing an EIT section
diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c 
b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
index ce7dd6cafc8b..d79b65854627 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
@@ -467,8 +467,10 @@ struct vidtv_encoder
        e->is_video_encoder = false;
 
        ctx = kzalloc(priv_sz, GFP_KERNEL);
-       if (!ctx)
+       if (!ctx) {
+               kfree(e);
                return NULL;
+       }
 
        e->ctx = ctx;
        ctx->last_duration = 0;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_ts.h 
b/drivers/media/test-drivers/vidtv/vidtv_ts.h
index 10838a2b8389..f5e8e1f37f05 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_ts.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_ts.h
@@ -44,7 +44,7 @@ struct vidtv_mpeg_ts {
                u8 adaptation_field:1;
                u8 scrambling:2;
        } __packed;
-       struct vidtv_mpeg_ts_adaption adaption[];
+       struct vidtv_mpeg_ts_adaption *adaption;
 } __packed;
 
 /**
-- 
2.28.0