From f13c573e6bf3d3eb44406cdd76aa4a499ae973e3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 19 Feb 2010 14:09:25 -0300 Subject: [PATCH] --- yaml --- r: 181769 b: refs/heads/master c: 84f3751d6a6f766780dee509433bf7b3dfcdf465 h: refs/heads/master i: 181767: 696a4519171d489377fb2e1dceb25a0921897449 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/soc_mediabus.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c59dcba59ed..33744a4e27d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f3ca2f152844c5f6ea853077f56d0db877d1f7a +refs/heads/master: 84f3751d6a6f766780dee509433bf7b3dfcdf465 diff --git a/trunk/drivers/media/video/soc_mediabus.c b/trunk/drivers/media/video/soc_mediabus.c index 0149290ee5a6..8b63b6545e76 100644 --- a/trunk/drivers/media/video/soc_mediabus.c +++ b/trunk/drivers/media/video/soc_mediabus.c @@ -149,7 +149,8 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line); const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc( enum v4l2_mbus_pixelcode code) { - if ((unsigned int)(code - V4L2_MBUS_FMT_FIXED) > ARRAY_SIZE(mbus_fmt)) + if (code - V4L2_MBUS_FMT_FIXED > ARRAY_SIZE(mbus_fmt) || + code <= V4L2_MBUS_FMT_FIXED) return NULL; return mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1; }