diff options
author | Helen Fornazier <helen.koike@collabora.com> | 2019-03-06 17:42:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-03-19 15:41:33 -0400 |
commit | b72e449521247a463572c8398a7517d231207f00 (patch) | |
tree | 7fd8126a6b4c5dac03397ec7caf756c9b9cbfd29 /drivers/media/platform/vimc/vimc-streamer.c | |
parent | 5efbc65faeda3577d58c820557a0a57d2994b01b (diff) |
media: vimc: stream: cleanup frame field from struct vimc_stream
There is no need to have the frame field in the vimc_stream struct.
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Tested-by: André Almeida <andre.almeida@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/vimc/vimc-streamer.c')
-rw-r--r-- | drivers/media/platform/vimc/vimc-streamer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/platform/vimc/vimc-streamer.c b/drivers/media/platform/vimc/vimc-streamer.c index 392754c18046..b7c1fdef5f0d 100644 --- a/drivers/media/platform/vimc/vimc-streamer.c +++ b/drivers/media/platform/vimc/vimc-streamer.c | |||
@@ -117,6 +117,7 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream, | |||
117 | static int vimc_streamer_thread(void *data) | 117 | static int vimc_streamer_thread(void *data) |
118 | { | 118 | { |
119 | struct vimc_stream *stream = data; | 119 | struct vimc_stream *stream = data; |
120 | u8 *frame = NULL; | ||
120 | int i; | 121 | int i; |
121 | 122 | ||
122 | set_freezable(); | 123 | set_freezable(); |
@@ -127,12 +128,9 @@ static int vimc_streamer_thread(void *data) | |||
127 | break; | 128 | break; |
128 | 129 | ||
129 | for (i = stream->pipe_size - 1; i >= 0; i--) { | 130 | for (i = stream->pipe_size - 1; i >= 0; i--) { |
130 | stream->frame = stream->ved_pipeline[i]->process_frame( | 131 | frame = stream->ved_pipeline[i]->process_frame( |
131 | stream->ved_pipeline[i], | 132 | stream->ved_pipeline[i], frame); |
132 | stream->frame); | 133 | if (!frame || IS_ERR(frame)) |
133 | if (!stream->frame) | ||
134 | break; | ||
135 | if (IS_ERR(stream->frame)) | ||
136 | break; | 134 | break; |
137 | } | 135 | } |
138 | //wait for 60hz | 136 | //wait for 60hz |