diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 18:59:53 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 18:59:53 -0400 |
| commit | 862e53126535fae47675c8b4cfcd0326a25193c3 (patch) | |
| tree | 83a31fa68a33d21cdf83754e561c4cf50b0f98cd | |
| parent | fafc5a9629b7c8b7aaea07a3a196230f8d75c3a5 (diff) | |
| download | longterm-queue-4.18-862e53126535fae47675c8b4cfcd0326a25193c3.tar.gz | |
media: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/media-video-mux-fix-null-pointer-dereferences.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/media-video-mux-fix-null-pointer-dereferences.patch b/queue/media-video-mux-fix-null-pointer-dereferences.patch index 79da98c..daf89a0 100644 --- a/queue/media-video-mux-fix-null-pointer-dereferences.patch +++ b/queue/media-video-mux-fix-null-pointer-dereferences.patch @@ -1,4 +1,4 @@ -From aeb0d0f581e2079868e64a2e5ee346d340376eae Mon Sep 17 00:00:00 2001 +From 5027cf118c236abb25ff8d7aa7468737d9aecaf3 Mon Sep 17 00:00:00 2001 From: Kangjie Lu <kjlu@umn.edu> Date: Sat, 9 Mar 2019 02:20:56 -0500 Subject: [PATCH] media: video-mux: fix null pointer dereferences @@ -14,10 +14,10 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c -index 0ba30756e1e4..d8cd5f5cb10d 100644 +index 1fb887293337..8de4506ae263 100644 --- a/drivers/media/platform/video-mux.c +++ b/drivers/media/platform/video-mux.c -@@ -419,9 +419,14 @@ static int video_mux_probe(struct platform_device *pdev) +@@ -256,9 +256,14 @@ static int video_mux_probe(struct platform_device *pdev) vmux->active = -1; vmux->pads = devm_kcalloc(dev, num_pads, sizeof(*vmux->pads), GFP_KERNEL); @@ -30,8 +30,8 @@ index 0ba30756e1e4..d8cd5f5cb10d 100644 + if (!vmux->format_mbus) + return -ENOMEM; - for (i = 0; i < num_pads; i++) { - vmux->pads[i].flags = (i < num_pads - 1) ? MEDIA_PAD_FL_SINK + for (i = 0; i < num_pads - 1; i++) + vmux->pads[i].flags = MEDIA_PAD_FL_SINK; -- 2.7.4 |