From: Ezequiel Garcia Date: Mon, 28 Sep 2015 21:36:51 +0000 (-0300) Subject: [media] vivid: Fix iteration in driver removal path X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5d42b8c3b3ddccd88dc1c70957177d31a6699fb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [media] vivid: Fix iteration in driver removal path When the diver is removed and all the resources are deallocated, we should be iterating through the created devices only. Currently, the iteration ends when vivid_devs[i] is NULL. Since the array contains VIVID_MAX_DEVS elements, it will oops if n_devs=VIVID_MAX_DEVS because in that case, no element is NULL. Fixes: c88a96b023d8 ('[media] vivid: add core driver code') Signed-off-by: Ezequiel Garcia Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index a047b4716741..0f5e9143cc7e 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -1341,8 +1341,11 @@ static int vivid_remove(struct platform_device *pdev) struct vivid_dev *dev; unsigned i; - for (i = 0; vivid_devs[i]; i++) { + + for (i = 0; i < n_devs; i++) { dev = vivid_devs[i]; + if (!dev) + continue; if (dev->has_vid_cap) { v4l2_info(&dev->v4l2_dev, "unregistering %s\n",