From patchwork Mon Apr 7 13:16:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 3945431 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 04F09BFF02 for ; Mon, 7 Apr 2014 13:16:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BC512022F for ; Mon, 7 Apr 2014 13:16:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C2F42022D for ; Mon, 7 Apr 2014 13:16:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755363AbaDGNQv (ORCPT ); Mon, 7 Apr 2014 09:16:51 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:34049 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755338AbaDGNQu (ORCPT ); Mon, 7 Apr 2014 09:16:50 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3N00DE4WW103C0@mailout1.samsung.com> for linux-media@vger.kernel.org; Mon, 07 Apr 2014 22:16:49 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-48-5342a541a589 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id CA.59.29263.145A2435; Mon, 07 Apr 2014 22:16:49 +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 <0N3N00MSNWV2V030@mmp2.samsung.com>; Mon, 07 Apr 2014 22:16:49 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, Jacek Anaszewski , Kyungmin Park Subject: [PATCH 5/8] [media] s5p-jpeg: g_selection callback should always succeed Date: Mon, 07 Apr 2014 15:16:10 +0200 Message-id: <1396876573-15811-5-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1396876573-15811-1-git-send-email-j.anaszewski@samsung.com> References: <1396876573-15811-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCJMWRmVeSWpSXmKPExsVy+t9jQV3HpU7BBqvOKVr0Xn3OaHG26Q27 Rc+GrawWh9+0szqwePRtWcXo8XmTXABTFJdNSmpOZllqkb5dAldGw4XtzAXNHBXfX0xjbmB8 ytbFyMkhIWAicf78VChbTOLCvfVANheHkMB0RonXPx8xQjjtTBJvb19iBqliEzCU+PniNROI LSIgL/Gk9wZQBwcHs0CJxKH1iiBhYYFgiU8tP9hBbBYBVYnFG/rAWnkFPCROTdvCBFIuIaAg MWeSDUiYU8BTYtrKTYwgthBQyaOXr9knMPIuYGRYxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7 iREcFs+kdjCubLA4xCjAwajEwxtwwDFYiDWxrLgy9xCjBAezkgivYZdTsBBvSmJlVWpRfnxR aU5q8SFGaQ4WJXHeA63WgUIC6YklqdmpqQWpRTBZJg5OqQbGOdJ37+lV81r3yPgbs8wRc1eY uf5WK/fv/yU3jqgGzSneuHDL02yF0O5Hp9W+W3jwPueV2HDRRef84kcbV+d+WRyXfdHqg7RR R/Lssid+1z5dnbVZpTGpVLxiNVPG243bZjOcL2Evc3P3cXra9H5XaJT5u90Cu+6v3n5FLWBN 3/vjvVum8D3tUmIpzkg01GIuKk4EAC4s9FYHAgAA 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.2 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 913a027..8a15c4a 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 */