From patchwork Thu Apr 10 07:32:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 3960231 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C4A49F336 for ; Thu, 10 Apr 2014 07:32:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9DDD20630 for ; Thu, 10 Apr 2014 07:32:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B568920629 for ; Thu, 10 Apr 2014 07:32:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965189AbaDJHcg (ORCPT ); Thu, 10 Apr 2014 03:32:36 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:63491 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965168AbaDJHce (ORCPT ); Thu, 10 Apr 2014 03:32:34 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3T00B410Y9WTB0@mailout2.samsung.com> for linux-media@vger.kernel.org; Thu, 10 Apr 2014 16:32:33 +0900 (KST) X-AuditID: cbfee61b-b7f456d000006dfd-e8-534649110318 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 95.18.28157.11946435; Thu, 10 Apr 2014 16:32:33 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N3T005990XW0YD0@mmp2.samsung.com>; Thu, 10 Apr 2014 16:32:33 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, Jacek Anaszewski , Kyungmin Park Subject: [PATCH v2 5/8] s5p-jpeg: g_selection callback should always succeed Date: Thu, 10 Apr 2014 09:32:15 +0200 Message-id: <1397115138-1095-5-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1397115138-1095-1-git-send-email-j.anaszewski@samsung.com> References: <1397115138-1095-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEJMWRmVeSWpSXmKPExsVy+t9jQV1BT7dgg/NTBCx6rz5ntDjb9Ibd omfDVlaLw2/aWR1YPPq2rGL0+LxJLoApissmJTUnsyy1SN8ugSujafJqpoJmjooTr/waGJ+y dTFyckgImEj87fjOCGGLSVy4tx4ozsUhJDCdUaL5yWlmkISQQDuTxJoJ3iA2m4ChxM8Xr5lA bBEBeYknvTeAGjg4mAVKJA6tVwQJCwv4SCzf9QashEVAVaJpzjqwMbwC7hLHWiawg5RLCChI zJlkAxLmFPCQ+LFnPdQmd4mNk68zT2DkXcDIsIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/dxMj OCSeSe9gXNVgcYhRgINRiYf3wDLXYCHWxLLiytxDjBIczEoivApCbsFCvCmJlVWpRfnxRaU5 qcWHGKU5WJTEeQ+2WgcKCaQnlqRmp6YWpBbBZJk4OKUaGD0Dc9N83tWvtjVJ/3W3OvXlkjrX ldFPVvGznrkpYe7mriD7fhFH2M76b4HOZxoiz2/9tMw73Oic4MLtT1dd3bTK3+j6giyb0Ip7 KxODl7RaLV0z/WZv6NLAZBm2lfdFhBsbZb05Dkq88MvUvzX5UWWf6IP8nfMO/nyXIhcp6ZDO Lf7c5nvjMyWW4oxEQy3mouJEAH81wBUFAgAA Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove erroneous guard preventing successful execution of g_selection callback in case the driver variant is different from SJPEG_S5P. Signed-off-by: Jacek Anaszewski Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 04260c2..541f03e 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1177,8 +1177,7 @@ static int s5p_jpeg_g_selection(struct file *file, void *priv, struct s5p_jpeg_ctx *ctx = fh_to_ctx(priv); if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT && - s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE && - ctx->jpeg->variant->version != SJPEG_S5P) + s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; /* For JPEG blob active == default == bounds */