Commit c2b6ca66 authored by Daniel W. S. Almeida's avatar Daniel W. S. Almeida Committed by Mauro Carvalho Chehab

media: vidtv: psi: fix missing assignments in while loops

Some variables were only assigned once but were used in while
loops as if they had been updated at every iteration. Fix this.
Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 99b99d13
...@@ -1175,9 +1175,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args) ...@@ -1175,9 +1175,7 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args)
struct vidtv_psi_desc *table_descriptor = args.pmt->descriptor; struct vidtv_psi_desc *table_descriptor = args.pmt->descriptor;
struct vidtv_psi_table_pmt_stream *stream = args.pmt->stream; struct vidtv_psi_table_pmt_stream *stream = args.pmt->stream;
struct vidtv_psi_desc *stream_descriptor = (stream) ? struct vidtv_psi_desc *stream_descriptor;
args.pmt->stream->descriptor :
NULL;
struct header_write_args h_args = {}; struct header_write_args h_args = {};
struct psi_write_args psi_args = {}; struct psi_write_args psi_args = {};
...@@ -1237,6 +1235,8 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args) ...@@ -1237,6 +1235,8 @@ u32 vidtv_psi_pmt_write_into(struct vidtv_psi_pmt_write_args args)
nbytes += vidtv_psi_ts_psi_write_into(psi_args); nbytes += vidtv_psi_ts_psi_write_into(psi_args);
stream_descriptor = stream->descriptor;
while (stream_descriptor) { while (stream_descriptor) {
/* write the stream descriptors, if any */ /* write the stream descriptors, if any */
d_args.dest_buf = args.buf; d_args.dest_buf = args.buf;
...@@ -1324,9 +1324,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args) ...@@ -1324,9 +1324,7 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args)
u32 crc = INITIAL_CRC; u32 crc = INITIAL_CRC;
struct vidtv_psi_table_sdt_service *service = args.sdt->service; struct vidtv_psi_table_sdt_service *service = args.sdt->service;
struct vidtv_psi_desc *service_desc = (args.sdt->service) ? struct vidtv_psi_desc *service_desc;
args.sdt->service->descriptor :
NULL;
struct header_write_args h_args = {}; struct header_write_args h_args = {};
struct psi_write_args psi_args = {}; struct psi_write_args psi_args = {};
...@@ -1373,6 +1371,8 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args) ...@@ -1373,6 +1371,8 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args)
nbytes += vidtv_psi_ts_psi_write_into(psi_args); nbytes += vidtv_psi_ts_psi_write_into(psi_args);
service_desc = service->descriptor;
while (service_desc) { while (service_desc) {
/* copy the service descriptors, if any */ /* copy the service descriptors, if any */
d_args.dest_buf = args.buf; d_args.dest_buf = args.buf;
...@@ -1616,9 +1616,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args) ...@@ -1616,9 +1616,7 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args)
struct vidtv_psi_desc *table_descriptor = args.nit->descriptor; struct vidtv_psi_desc *table_descriptor = args.nit->descriptor;
struct vidtv_psi_table_transport *transport = args.nit->transport; struct vidtv_psi_table_transport *transport = args.nit->transport;
struct vidtv_psi_desc *transport_descriptor = (transport) ? struct vidtv_psi_desc *transport_descriptor;
args.nit->transport->descriptor :
NULL;
struct header_write_args h_args = {}; struct header_write_args h_args = {};
struct psi_write_args psi_args = {}; struct psi_write_args psi_args = {};
...@@ -1686,6 +1684,8 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args) ...@@ -1686,6 +1684,8 @@ u32 vidtv_psi_nit_write_into(struct vidtv_psi_nit_write_args args)
nbytes += vidtv_psi_ts_psi_write_into(psi_args); nbytes += vidtv_psi_ts_psi_write_into(psi_args);
transport_descriptor = transport->descriptor;
while (transport_descriptor) { while (transport_descriptor) {
/* write the transport descriptors, if any */ /* write the transport descriptors, if any */
d_args.dest_buf = args.buf; d_args.dest_buf = args.buf;
...@@ -1823,9 +1823,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_write_args args) ...@@ -1823,9 +1823,7 @@ u32 vidtv_psi_eit_write_into(struct vidtv_psi_eit_write_args args)
u32 crc = INITIAL_CRC; u32 crc = INITIAL_CRC;
struct vidtv_psi_table_eit_event *event = args.eit->event; struct vidtv_psi_table_eit_event *event = args.eit->event;
struct vidtv_psi_desc *event_descriptor = (args.eit->event) ? struct vidtv_psi_desc *event_descriptor;
args.eit->event->descriptor :
NULL;
struct header_write_args h_args = {}; struct header_write_args h_args = {};
struct psi_write_args psi_args = {}; struct psi_write_args psi_args = {};
......
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