From patchwork Sun Jan 6 12:33:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 16143 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TrpPl-0000WR-83; Sun, 06 Jan 2013 13:33:21 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1TrpPk-0003Vy-AY; Sun, 06 Jan 2013 13:33:21 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755326Ab3AFMdM (ORCPT + 1 other); Sun, 6 Jan 2013 07:33:12 -0500 Received: from mail-ee0-f54.google.com ([74.125.83.54]:50126 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754937Ab3AFMdM (ORCPT ); Sun, 6 Jan 2013 07:33:12 -0500 Received: by mail-ee0-f54.google.com with SMTP id c13so9052335eek.41 for ; Sun, 06 Jan 2013 04:33:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=kN3Eg1xevyT70QQLk5yLqvZPUcHxAQhIQiPt/pGAqF4=; b=HhVv14oX/Fi05S3+qRunnCYWCPVFZjZxlSXFTrm5/gSOVNpDqhw/9Raxcs8OUBljYf gJBNZbr66LObB3vaAGeuuuqGvGmZB0nm2TvqVPZRxaq7sJgkdyJDcl4uUBGDE6RpM7pE IhzdcrNPrUbJAJ+FTyogU6jCqjWoNzNyoeuMrd6vNmDoGmt0TS+xb4b5G7+4Xwxdi2cT Chb3s9Fo4L5hExx5mrVNDjf3SYLS1na9WwieCpemYOBhPnYiKG9+fVxJw+skjF3gFvMk 4swlOn/XQPY2oMRGqQcRhJax5hmlFBT/Fwtc2gb8+CJ9ZmxuRb2t5SAlieiVOdU3RLuL EtZA== X-Received: by 10.14.219.72 with SMTP id l48mr159684871eep.37.1357475590959; Sun, 06 Jan 2013 04:33:10 -0800 (PST) Received: from localhost.localdomain (031011138205.warszawa.vectranet.pl. [31.11.138.205]) by mx.google.com with ESMTPS id 44sm123972570eek.0.2013.01.06.04.33.09 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 06 Jan 2013 04:33:10 -0800 (PST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: Tomasz Stanislawski , Sylwester Nawrocki Subject: [PATCH] s5p-tv: mixer: fix handling of VIDIOC_S_FMT Date: Sun, 6 Jan 2013 13:33:00 +0100 Message-Id: <1357475581-680-1-git-send-email-sylvester.nawrocki@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.1.6.122133 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __INT_PROD_TV 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Tomasz Stanislawski The VIDIOC_S_FMT ioctl must not fail if 4cc is invalid. It should adjust proposed 4cc to the available one. The s5p-mixer fails on s_fmt if unsupported 4cc is used. This patch fixes this issue by using the default format for a given layer. Signed-off-by: Tomasz Stanislawski Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/s5p-tv/mixer_video.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index 7379e77..405414f 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c @@ -324,10 +324,9 @@ static int mxr_s_fmt(struct file *file, void *priv, pix = &f->fmt.pix_mp; fmt = find_format_by_fourcc(layer, pix->pixelformat); if (fmt == NULL) { - mxr_warn(mdev, "not recognized fourcc: %08x\n", + mxr_dbg(mdev, "not recognized fourcc: %08x\n", pix->pixelformat); - return -EINVAL; + fmt = layer->fmt_array[0]; } layer->fmt = fmt; /* set source size to highest accepted value */ --