Received: by 10.213.65.68 with SMTP id h4csp1771899imn; Mon, 19 Mar 2018 12:50:53 -0700 (PDT) X-Google-Smtp-Source: AG47ELtqExyBQFz+QpZaUCXrBWUmJe5vrgYHUtNjL4UcqATXYV6E5CSdt0HyZfzjg/OoABU0WXMU X-Received: by 10.98.181.18 with SMTP id y18mr11281557pfe.115.1521489053187; Mon, 19 Mar 2018 12:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521489053; cv=none; d=google.com; s=arc-20160816; b=fz08Qv6aYRawLU13OSd2hzkoDPZgXstKYv3rA95DKOeLazm/kOnYO7OIe5rBPAWiK/ QBEDsMvixO8lmPLxWcyRcR9ZI6VY8V8POzhgl9wpRUdzben2u6HkXT5rLVQ7jpMln/Yg xh9ICSk9CgL5KXU4pPSB7hbaYfx2+FuwTKSLQXizfhseYySe3nZ1G1K2SgQWPyWPBMXG b/PjcRc1nNbbx/ZfJ7Fo7ZFCUAUAiIz/ph8PJufbvlG1DSaje9pbowV5fXJiCuWzyvBT sktgWoiK76GncGNUqzeoFXABOsyJSSBZiIymDNNoPkZQ4+nC8DBWpmFfRntM3Xb78P8+ Ss2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=dZNtslrSWIcA4dvCoi3furouGOErzVHG0Di18niDbWI=; b=OMIBlIz7JEPWKphrFI7IQWtT3OTpyBAQZv8bgGxZYAz/MB/zjM5VkdwR1b+1m49x6d q+grR8Z1C/mgpGroyXtRFPUxxm29ZgwHIzin3rjwQrqy8m0zByK0lbX/xq1zgVoksRLx uLU1kN+CZMUAE7fCT15/RWsG1heIRFwpDEBgzqJ8vUz+g43Hfid7Q4TeJjKOtd8XeYPT G9PiDO8R1wnGV3PHoiBDB9MmjiE2h3/wJvmgJaHWSB5AlugV2sKrq53j3A8ki1LhApFw KbvNCvoCih1mHZdiX+9P1C6w9+RCYhpxbdeO2SAS+NKI/l9+30Fed/AVgi6PE0soS8xo DE4w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 c1-v6si547466pla.34.2018.03.19.12.50.38; Mon, 19 Mar 2018 12:50:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969950AbeCSTrd (ORCPT + 99 others); Mon, 19 Mar 2018 15:47:33 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47654 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969528AbeCSSUY (ORCPT ); Mon, 19 Mar 2018 14:20:24 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 46F271090; Mon, 19 Mar 2018 18:20:23 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Janusz Krzysztofik , Guennadi Liakhovetski , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 055/241] [media] media: i2c/soc_camera: fix ov6650 sensor getting wrong clock Date: Mon, 19 Mar 2018 19:05:20 +0100 Message-Id: <20180319180753.495272584@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Janusz Krzysztofik [ Upstream commit 54449af0e0b2ea43a8166611c95b730c850c3184 ] After changes to v4l2_clk API introduced in v4.1 by commits a37462b919 '[media] V4L: remove clock name from v4l2_clk API' and 4f528afcfb '[media] V4L: add CCF support to the v4l2_clk API', ov6650 sensor stopped responding because v4l2_clk_get(), still called with depreciated V4L2 clock name "mclk", started to return respective CCF clock instead of the V4l2 one registered by soc_camera. Fix it by calling v4l2_clk_get() with NULL clock name. Created and tested on Amstrad Delta against Linux-4.7-rc3 with omap1_camera fixes. Signed-off-by: Janusz Krzysztofik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/soc_camera/ov6650.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/i2c/soc_camera/ov6650.c +++ b/drivers/media/i2c/soc_camera/ov6650.c @@ -1033,7 +1033,7 @@ static int ov6650_probe(struct i2c_clien priv->code = MEDIA_BUS_FMT_YUYV8_2X8; priv->colorspace = V4L2_COLORSPACE_JPEG; - priv->clk = v4l2_clk_get(&client->dev, "mclk"); + priv->clk = v4l2_clk_get(&client->dev, NULL); if (IS_ERR(priv->clk)) { ret = PTR_ERR(priv->clk); goto eclkget;