From patchwork Tue Jan 22 13:42:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10775531 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8CCC1390 for ; Tue, 22 Jan 2019 13:43:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8407298A9 for ; Tue, 22 Jan 2019 13:43:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C43C298D1; Tue, 22 Jan 2019 13:43:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48A7D298A9 for ; Tue, 22 Jan 2019 13:43:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728488AbfAVNnP (ORCPT ); Tue, 22 Jan 2019 08:43:15 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34481 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728305AbfAVNnP (ORCPT ); Tue, 22 Jan 2019 08:43:15 -0500 Received: by mail-pg1-f196.google.com with SMTP id j10so11111342pga.1 for ; Tue, 22 Jan 2019 05:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Vc2c/+U0K+i3PDuQKIuUzE1dLsI3MguVhRYJJzQN88Q=; b=N5jbdV6WeFoWI3z3/ZCd+k9xo/C8c2omnrqE9POPSEfJCUZYnvqvXpvYQqk5ZfKoV6 ie5jtoAOdXEeC4dvnVDmzkXbLK/T+2/WVt2GYR1NuDtB3PGEAhPU4KPOq3HVGXJKklck JQDbZeZNu2BOIqZoSDxs+W6sp7i04jlpehMMkgWxmEFUiJCZGZcCNBeTYcSzDX1Ruf1g 08DXQ4QC9abGpTo87nKiVKfA651ecRzoFpAfQ4myfUB5ReJOVy69T6OonhLStlYe969Q iN5ZQ0GMhF8cJbS8l1eLbbQW3FG81gkcKRBwxx0JepIdcuQjsfjDoG94zlu9t0x8zlFm eT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Vc2c/+U0K+i3PDuQKIuUzE1dLsI3MguVhRYJJzQN88Q=; b=fJoeVnaJLtsqCPO05wSo4uQHAXgSyFdsTP36sX6dMV+C3b4k+25NQZbatM2bv3lQ6f ceJIoKgF8GQcZdStO1866FIcwQpQtnojH88ajsuM5jt2lY4OLTQ+IVPxxLtyPg0HDh3r yD2dgYq8MnmXSP0BcptRiMIoBXRBQa+I2Ns18fDbuq1Isn7j8U+x8eYG/alhK31Tf7vG 6hQoJ0jvqCl4DWxVVgCZRF2wnfZ2glaasDVaiSOZ3oafmws0j9jzE5OHr+zNGkGT4/w8 x1h4E4Ax9Ucn2W9kkWfimhwYKnHwhCCixABdL5m9TKDU4e4kiMxp+V9RJtkG+p1j4jTa +IQA== X-Gm-Message-State: AJcUukej6UH/3rsRfQ00dUJh7N80ANjAZAXVUk0lKIFvZQ94HYJWD2Pb GdE3EAsmSCkuPikgxWg09waE7ocP X-Google-Smtp-Source: ALg8bN6/T1etB4bxiBdpztPuA4w6X+DsyrqjZ7AmKEZ5rgm/Rr//i0OkjAH1QjxoLTLjTHTS8mszUQ== X-Received: by 2002:a62:39cb:: with SMTP id u72mr10888564pfj.223.1548164594476; Tue, 22 Jan 2019 05:43:14 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:b4ea:7cb5:3c80:b4f1]) by smtp.gmail.com with ESMTPSA id r66sm25435133pfk.157.2019.01.22.05.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:43:13 -0800 (PST) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH -next] media: ov2640: fix initial try format Date: Tue, 22 Jan 2019 22:42:59 +0900 Message-Id: <1548164579-21458-1-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Set initial try format with default configuration instead of current one. Fixes: 8d3b307a150a ("media: ov2640: make VIDIOC_SUBDEV_G_FMT ioctl work with V4L2_SUBDEV_FORMAT_TRY") Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- drivers/media/i2c/ov2640.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c index 37e7c98..83031cf 100644 --- a/drivers/media/i2c/ov2640.c +++ b/drivers/media/i2c/ov2640.c @@ -1011,14 +1011,14 @@ static int ov2640_init_cfg(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg) { #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API - struct i2c_client *client = v4l2_get_subdevdata(sd); - struct ov2640_priv *priv = to_ov2640(client); struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_get_try_format(sd, cfg, 0); + const struct ov2640_win_size *win = + ov2640_select_win(SVGA_WIDTH, SVGA_HEIGHT); - try_fmt->width = priv->win->width; - try_fmt->height = priv->win->height; - try_fmt->code = priv->cfmt_code; + try_fmt->width = win->width; + try_fmt->height = win->height; + try_fmt->code = MEDIA_BUS_FMT_UYVY8_2X8; try_fmt->colorspace = V4L2_COLORSPACE_SRGB; try_fmt->field = V4L2_FIELD_NONE; try_fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;