summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-07-11 15:19:43 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:13 (GMT)
commitba388b1ce1562b16e605155850be2901aa9c3dce (patch)
tree8bf159198b667086674983ff2fa12c7b43b9aef5
parent6957afc2c53248b04751a1f042026bd47b75bfdd (diff)
downloadlinux-3.10-ba388b1ce1562b16e605155850be2901aa9c3dce.zip
linux-3.10-ba388b1ce1562b16e605155850be2901aa9c3dce.tar.gz
linux-3.10-ba388b1ce1562b16e605155850be2901aa9c3dce.tar.bz2
[media] s5p-jpeg: return error immediately after get_byte fails
When parsing JPEG header s5p_jpeg_parse_hdr function should return immediately in case there was an error while reading a byte. Change-Id: I82429c1e2878f27276594da1069b30c40b83aadb Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 126199e..a3f8862 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -906,14 +906,14 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,
while (notfound) {
c = get_byte(&jpeg_buffer);
if (c == -1)
- break;
+ return false;
if (c != 0xff)
continue;
do
c = get_byte(&jpeg_buffer);
while (c == 0xff);
if (c == -1)
- break;
+ return false;
if (c == 0)
continue;
length = 0;