From patchwork Mon Dec 3 02:50:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1831841 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id F2A32DF254 for ; Mon, 3 Dec 2012 02:50:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754677Ab2LCCus (ORCPT ); Sun, 2 Dec 2012 21:50:48 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:46195 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752153Ab2LCCur (ORCPT ); Sun, 2 Dec 2012 21:50:47 -0500 Received: by mail-qc0-f174.google.com with SMTP id o22so1273869qcr.19 for ; Sun, 02 Dec 2012 18:50:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=5HK7s0FEG8kwM7zaDj4P2WAJrACenqlPJVQxrk2DmCE=; b=H8e9JQtg/i3vEl4uLj/iGIKl+BhbUvF+80WygUZ95QlfsmGnBITB9B6SbWrDfFWp7S 3gqOmIx89QPIQhrahICRhVUBfSE1GO/hF2vI/vSL4QXfAqxT4S5U+kecNn3jKoJUIuma xrpqVwQresX0dQ4HJRFn45eD+x9bThTFDp8Nzcsb+hvUM/PpZIymTxW36+5ewsLp2LtM VpTA0atMnI9OyXKdltGgTCLIhwXKGbOVoDDQUu4Otm/OdvXfm7ec/PtKtLlUgafu/q9j 1yLZkDP+UZXS4XuTu9mjjem8V3JJqN7Dcke3lmSkydiC8lSHSvZiha3Gxi4j5vlIwMAP mKnA== MIME-Version: 1.0 Received: by 10.224.195.136 with SMTP id ec8mr14594015qab.98.1354503047208; Sun, 02 Dec 2012 18:50:47 -0800 (PST) Received: by 10.229.126.165 with HTTP; Sun, 2 Dec 2012 18:50:47 -0800 (PST) Date: Sun, 2 Dec 2012 21:50:47 -0500 Message-ID: Subject: [PATCH -next] [media] media: davinci: vpbe: return error code on error in vpbe_display_g_crop() From: Wei Yongjun To: manjunath.hadli@ti.com, prabhakar.lad@ti.com, mchehab@redhat.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org, davinci-linux-open-source@linux.davincidsp.com Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Wei Yongjun We have assigned error code to 'ret' if crop->type is not V4L2_BUF_TYPE_VIDEO_OUTPUT, but never use it. We'd better return the error code on this error. Signed-off-by: Wei Yongjun Acked-by: Prabhakar Lad --- drivers/media/platform/davinci/vpbe_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 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/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 2bfde79..119a100 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -791,7 +791,6 @@ static int vpbe_display_g_crop(struct file *file, void *priv, struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev; struct osd_state *osd_device = fh->disp_dev->osd_device; struct v4l2_rect *rect = &crop->c; - int ret; v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_G_CROP, layer id = %d\n", @@ -799,7 +798,7 @@ static int vpbe_display_g_crop(struct file *file, void *priv, if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) { v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buf type\n"); - ret = -EINVAL; + return -EINVAL; } osd_device->ops.get_layer_config(osd_device, layer->layer_info.id, cfg);