Commit 3d1387b3 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: vidtv: fix some warnings

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: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent cc2ff973
...@@ -743,7 +743,7 @@ struct vidtv_psi_table_eit { ...@@ -743,7 +743,7 @@ struct vidtv_psi_table_eit {
struct vidtv_psi_table_eit struct vidtv_psi_table_eit
*vidtv_psi_eit_table_init(u16 network_id, *vidtv_psi_eit_table_init(u16 network_id,
u16 transport_stream_id, u16 transport_stream_id,
u16 service_id); __be16 service_id);
/** /**
* struct vidtv_psi_eit_write_args - Arguments for writing an EIT section * struct vidtv_psi_eit_write_args - Arguments for writing an EIT section
......
...@@ -467,8 +467,10 @@ struct vidtv_encoder ...@@ -467,8 +467,10 @@ struct vidtv_encoder
e->is_video_encoder = false; e->is_video_encoder = false;
ctx = kzalloc(priv_sz, GFP_KERNEL); ctx = kzalloc(priv_sz, GFP_KERNEL);
if (!ctx) if (!ctx) {
kfree(e);
return NULL; return NULL;
}
e->ctx = ctx; e->ctx = ctx;
ctx->last_duration = 0; ctx->last_duration = 0;
......
...@@ -44,7 +44,7 @@ struct vidtv_mpeg_ts { ...@@ -44,7 +44,7 @@ struct vidtv_mpeg_ts {
u8 adaptation_field:1; u8 adaptation_field:1;
u8 scrambling:2; u8 scrambling:2;
} __packed; } __packed;
struct vidtv_mpeg_ts_adaption adaption[]; struct vidtv_mpeg_ts_adaption *adaption;
} __packed; } __packed;
/** /**
......
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