From patchwork Thu Oct 3 15:53:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175165 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp581834ill; Thu, 3 Oct 2019 09:50:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxB6gO5alAdbLl0JkO8be3PZ4jyG912vWGeiwq+dq/xQBkG2FYFdCJHSUz/4+C1krehAiSR X-Received: by 2002:a50:ab0f:: with SMTP id s15mr10517300edc.119.1570121422489; Thu, 03 Oct 2019 09:50:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570121422; cv=none; d=google.com; s=arc-20160816; b=b1vQd/asaw8rioyCz5OJZGUi8pVjjdPnN4CkpTtGFfCSkWFtPnsHHTvm9laU97VaKS /xZ7TRNIJvEkLc8o1qq+5rAqDhHHJdA5A1c9KSCIowFQZO/M3LU9U4rQO6W/1KZuqziT 1uIN7jwrk3lZibadEtHkX1XxaWj6mNBhGkK/S4SK1VaA5C6QmKr90RJrjMxZXBAmmAy9 0yPTpjBMFudyQHm25+EqR7x/x2+PNBkLMwey4wO9MN4g5qprVarPFSgH0FVlJhKUfwp1 sSzs1rSTwkc1Dnqan3Ru+ayaTA6yscT3VK2eyzU2C/nGRvV9KTTJfj+XO+pMG37IdWRp AwJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W3uzchdDUfkZ9gd1ywkf2DPg0es83fEdO0mu3YoqYBk=; b=ZZD2glRR5J8A8cWpz4H7+SY4cSgMNmIdcLgIGHcC1h3O2f4y44HhRIjRWLpMoximx3 BEQO7yuaG33lgRwvgG5uuBJniHmBZlR5Ki/0a3UvednUvD3pfxbr0OObcLPQqPlSr8i8 7D2IfyRjxBpvgNGzLgCw3tsy0FR5k1wyZvSKC0tIyLbqE27Tcr0QEpUvRoSaNsjmV9ev tOmkvjNpMZo6czEjkDJULpyn83+/aSwrqin02PV+c1DWC6ZSCC6kUl1I+na3O8PCoBzv r3ChQ71U0yN12Qom+8xucb2CHY2pO3VGqYT4/OtnnssEXWk++BBFFZC6y4NvaHbaMuAg E1Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GtZggPUf; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v13si1734755edy.441.2019.10.03.09.50.21; Thu, 03 Oct 2019 09:50:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GtZggPUf; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405040AbfJCQuU (ORCPT + 14 others); Thu, 3 Oct 2019 12:50:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:37362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404546AbfJCQuT (ORCPT ); Thu, 3 Oct 2019 12:50:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E42F8215EA; Thu, 3 Oct 2019 16:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121418; bh=p4KhjG1+Btil1DJt/BXGtuxMmF2t2VXOhj88S3TeQ+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GtZggPUfWu+YTwvBboMSKsQl30FqUCOxfjG7p1aJ+EbB0LsONY94Rq5DcCkn9ZPc5 L0i9dkjGdq8nAIGph7IfnEvx7ZTF0wYO2zuu6ox8gBFUD4P4Q0HhdYU6g43qKDXx7K 2uQmlQluGeZXiPMROq9+NTJemN4BEXQyuVuNxBzQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guillaume Tucker , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.3 272/344] media: vivid: fix device init when no_error_inj=1 and fb disabled Date: Thu, 3 Oct 2019 17:53:57 +0200 Message-Id: <20191003154607.047447508@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guillaume Tucker commit 79e85d1d2c16ba4907bb9d6a4381516b729ff341 upstream. Add an extra condition to add the video output control class when the device has some hdmi outputs defined. This is required to then always be able to add the display present control, which is enabled when there are some hdmi outputs. This fixes the corner case where no_error_inj is enabled and the device has no frame buffer but some hdmi outputs, as otherwise the video output control class would be added anyway. Without this fix, the sanity checks fail in v4l2_ctrl_new() as name is NULL. Fixes: c533435ffb91 ("media: vivid: add display present control") Cc: stable@vger.kernel.org # for 5.3 Signed-off-by: Guillaume Tucker Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/vivid/vivid-ctrls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/platform/vivid/vivid-ctrls.c +++ b/drivers/media/platform/vivid/vivid-ctrls.c @@ -1473,7 +1473,7 @@ int vivid_create_controls(struct vivid_d v4l2_ctrl_handler_init(hdl_vid_cap, 55); v4l2_ctrl_new_custom(hdl_vid_cap, &vivid_ctrl_class, NULL); v4l2_ctrl_handler_init(hdl_vid_out, 26); - if (!no_error_inj || dev->has_fb) + if (!no_error_inj || dev->has_fb || dev->num_hdmi_outputs) v4l2_ctrl_new_custom(hdl_vid_out, &vivid_ctrl_class, NULL); v4l2_ctrl_handler_init(hdl_vbi_cap, 21); v4l2_ctrl_new_custom(hdl_vbi_cap, &vivid_ctrl_class, NULL);