Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2705173pxj; Mon, 10 May 2021 08:56:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqXsujjve3CczYokHXALKYZcBA3aWv1Ba2F4iHUopLmGvM2xznN8VZnPiGRl98hzo9JfiH X-Received: by 2002:a92:7510:: with SMTP id q16mr21413442ilc.291.1620662205729; Mon, 10 May 2021 08:56:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620662205; cv=none; d=google.com; s=arc-20160816; b=QCugXNy5Q6a+nrCwOs4xndOhuzl+2jjtJvHPzmHK+FZUVZBgnwTVss9hBC82dkmTAC 6OnpATAwbb2yQrnIqZohdkHkyXlcAiF89w99CcLi6EpSuu7iUHXtMoYZW7K5cWpg0MIL rzgKEWiPpjZjLgYSuYhHtwM+FZPF9mnt0CYrU2+fMGAnL2KkmZ146p+JyC0+voXDPlgL biGxLfAzdSC5kcDFzbhT6HmRv76s7DAQu99WNjrx62a3sUPThb9+LSSnPEQd94GRC5Z6 Jj8N2RlsE6FNZeNc9uLdiPwX6XEO2adfIACQg9AnXNfB9g5YK4ySSlpyuzMU1WTMi4WS L+Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=31ZSD30Q7luop3fzqNqxot7qGqItE0Vc3Kcjw6Omv2M=; b=F9oaFqGtWomMV8zxgPNIpELdl4vaZObzlSTB6WVFn2X0fYDCkNpFuywytAaR0WHKfu c6TirfRP87BlaYhw5ycT6FngtHgMLaA7UaTVq9s30vXVbGihgECER+7U3TlNmY1t+mMn +yYce4eGMrCkzVg9UZ/DMVZbdYHbzH7ICtVNB8X3xOL6ISvC3OIAfCzO+qF6lEFmiNdE ToCrKnUaKHcjBPk7XVY7Sgy37DgOZBNzDyfTYJ/aujFzgNM3KvUhX1C0UgtRiqKkHbWF syB6NUUC4ji5MUAmFPQbkGyKAqllazcC0xapdk2WHVxzHfUGT5DmdAAzuJembypHWEPz ljzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gKLqZLZZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u4si12916234jad.12.2021.05.10.08.56.33; Mon, 10 May 2021 08:56:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gKLqZLZZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240428AbhEJLai (ORCPT + 99 others); Mon, 10 May 2021 07:30:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:53024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234833AbhEJK5K (ORCPT ); Mon, 10 May 2021 06:57:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 328A26157F; Mon, 10 May 2021 10:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643782; bh=8xW11yx65LCj4/dPIjgckIblW+bhn6N20VnQPTGV54c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gKLqZLZZevs6yV12Nm41LB+t19QTpJkx556hgRcKnceUDj+Au9t9kQ5TuoP8TSeJ7 90nfPXFRafdhn02N5JIRMhiIyEt5PHbxIdKx4kcsVk/0cPa01X+PfiwVB1QfdIVsYr hzUI58vVJFWUplDTD1Yb52pXR9NRBEY1Db8tbUlI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laurent Pinchart , Rui Miguel Silva , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.11 156/342] media: imx: capture: Return -EPIPE from __capture_legacy_try_fmt() Date: Mon, 10 May 2021 12:19:06 +0200 Message-Id: <20210510102015.249087881@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurent Pinchart [ Upstream commit cc271b6754691af74d710b761eaf027e3743e243 ] The correct return code to report an invalid pipeline configuration is -EPIPE. Return it instead of -EINVAL from __capture_legacy_try_fmt() when the capture format doesn't match the media bus format of the connected subdev. Signed-off-by: Laurent Pinchart Reviewed-by: Rui Miguel Silva Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/imx/imx-media-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index c1931eb2540e..b2f2cb3d6a60 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -557,7 +557,7 @@ static int capture_validate_fmt(struct capture_priv *priv) priv->vdev.fmt.fmt.pix.height != f.fmt.pix.height || priv->vdev.cc->cs != cc->cs || priv->vdev.compose.width != compose.width || - priv->vdev.compose.height != compose.height) ? -EINVAL : 0; + priv->vdev.compose.height != compose.height) ? -EPIPE : 0; } static int capture_start_streaming(struct vb2_queue *vq, unsigned int count) -- 2.30.2