Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8464648ybl; Thu, 16 Jan 2020 17:22:58 -0800 (PST) X-Google-Smtp-Source: APXvYqwNwKxmvB4OM7XE0sw4ztV4X08BR/g4I9cHg6d4UHiT/SJpEln/jn5nTK4xlKF8DO2IZOqP X-Received: by 2002:aca:4b46:: with SMTP id y67mr1667978oia.121.1579224178779; Thu, 16 Jan 2020 17:22:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579224178; cv=none; d=google.com; s=arc-20160816; b=hZ2mvHRxeNSvmyQ1RQmNllO8UFLc1EefkYe3ESjeemoK+S9a/bRFrHNyxJWHUBTRoU GeRGbPVo4Jf8v9o90VEiRzYQGCn/Mp/rn85VVwxGrh1UXgz280j6eUdoz+jU1k4HyFvZ TlsWIXszm5B+K+02cc1+HXlNt6jWCG4rsOCFBC9oUTDzQcvvcbioBjI6K6kW9AhIN5BU r2bFmR1NDMlYubLzZxnQcSjBamrLmnocNf39Fs/zLZgGuHoIQOlS0Gn0Hl1poKwSTPcO /KAwaiglKSQejfbX29xvgVC/NEgEHbwJ1WirMI7nriDgGmnG5DsmoAv3Cs6y0+/rkCPg 9Ulg== 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=spp+WKGueV5taMKxiXZGc+EPjm4I5/PLLcNpSrGSzDs=; b=H8hx5HoSzz98t+sPB4lE07UleXCFTDUCyfbBVv+SLPAgimDKz3j9J7jwg6FpgdmzFC J5NwERgVQqoChOr6ddNIHp4WKXB+G4R3hbroJyc41vFYnlqcoaKQy5sDjl3I+XhPUgSR 0TqACqpDXroIlxDiQy1x1StiF3pBbU3Uqat2xvcPk9J7iHFzGHZmEiaYAVUronO+t1A2 Ti2a+XPUNfSeaiurd4gg0jFrYII2/VMu+XUYPUytKIEnnqEuaWGvujgIDdtbhddvZ5c6 Uo2EpwAEk61s6bWZM4ArwUd/aKR8zyZfkzBsgnQsmMbZ8yTKkCcLWDRwBh3GeyeKU/Y9 GiIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DTkzVWGA; 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 z12si15801178otm.189.2020.01.16.17.22.46; Thu, 16 Jan 2020 17:22:58 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=DTkzVWGA; 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 S2388122AbgAPXZN (ORCPT + 99 others); Thu, 16 Jan 2020 18:25:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:54446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730302AbgAPXZD (ORCPT ); Thu, 16 Jan 2020 18:25:03 -0500 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 C14612072B; Thu, 16 Jan 2020 23:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217103; bh=NSPwKSCXXk+sKxxvdvO/ts9c48CH8XGxM2OgPCbg3Cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DTkzVWGAb4I9O3/ozu4jtRl6zh3CrkgDUMmB7DB/LLp8+rr7bRIX+hrRsRTiLivEk 34QWp7JRaDeWz1/gt8FcYtZQZVJPOBEFGy8CyfiFYLlOmrF2Zqh+0Ro7qwh76jSZNL acZ7pJQ5GQPpzXwF2/NcgJEmdMoQ8pY2FPvuaqkw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Janusz Krzysztofik , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 5.4 149/203] media: ov6650: Fix default format not applied on device probe Date: Fri, 17 Jan 2020 00:17:46 +0100 Message-Id: <20200116231757.928202568@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231745.218684830@linuxfoundation.org> References: <20200116231745.218684830@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Janusz Krzysztofik commit 5439fa9263cb293e41168bc03711ec18c4f11cba upstream. It is not clear what pixel format is actually configured in hardware on reset. MEDIA_BUS_FMT_YUYV8_2X8, assumed on device probe since the driver was intiially submitted, is for sure not the one. Fix it by explicitly applying a known, driver default frame format just after initial device reset. Fixes: 2f6e2404799a ("[media] SoC Camera: add driver for OV6650 sensor") Signed-off-by: Janusz Krzysztofik Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/ov6650.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/media/i2c/ov6650.c +++ b/drivers/media/i2c/ov6650.c @@ -877,6 +877,11 @@ static int ov6650_video_probe(struct v4l ret = ov6650_reset(client); if (!ret) ret = ov6650_prog_dflt(client); + if (!ret) { + struct v4l2_mbus_framefmt mf = ov6650_def_fmt; + + ret = ov6650_s_fmt(sd, &mf); + } if (!ret) ret = v4l2_ctrl_handler_setup(&priv->hdl); @@ -1031,8 +1036,6 @@ static int ov6650_probe(struct i2c_clien priv->rect.top = DEF_VSTRT << 1; priv->rect.width = W_CIF; priv->rect.height = H_CIF; - priv->half_scale = false; - priv->code = MEDIA_BUS_FMT_YUYV8_2X8; /* Hardware default frame interval */ priv->tpf.numerator = GET_CLKRC_DIV(DEF_CLKRC);