From: Antti Palosaari Date: Sun, 17 May 2015 11:38:04 +0000 (-0300) Subject: [media] v4l2: correct two SDR format names X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48fc10aaf180d71bd7953f9e25b0fd7393b5123a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [media] v4l2: correct two SDR format names U8 and U16LE format human readable names were translated with string containing emulated word. These strings were taken from msi2500 driver, where those formats were emulated (after module parameter is set). But on API correct names should be used, without any special case notes. Signed-off-by: Antti Palosaari Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index c5677e4030bb..368bc3a973d4 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1216,8 +1216,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_TM6000: descr = "A/V + VBI Mux Packet"; break; case V4L2_PIX_FMT_CIT_YYVYUY: descr = "GSPCA CIT YYVYUY"; break; case V4L2_PIX_FMT_KONICA420: descr = "GSPCA KONICA420"; break; - case V4L2_SDR_FMT_CU8: descr = "Complex U8 (Emulated)"; break; - case V4L2_SDR_FMT_CU16LE: descr = "Complex U16LE (Emulated)"; break; + case V4L2_SDR_FMT_CU8: descr = "Complex U8"; break; + case V4L2_SDR_FMT_CU16LE: descr = "Complex U16LE"; break; case V4L2_SDR_FMT_CS8: descr = "Complex S8"; break; case V4L2_SDR_FMT_CS14LE: descr = "Complex S14LE"; break; case V4L2_SDR_FMT_RU12LE: descr = "Real U12LE"; break;