From patchwork Fri Apr 19 09:53:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2464201 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 36A5C3FD1A for ; Fri, 19 Apr 2013 09:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968232Ab3DSJx6 (ORCPT ); Fri, 19 Apr 2013 05:53:58 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:40622 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968061Ab3DSJxz (ORCPT ); Fri, 19 Apr 2013 05:53:55 -0400 Received: by mail-pa0-f53.google.com with SMTP id bh4so2170515pad.40 for ; Fri, 19 Apr 2013 02:53:54 -0700 (PDT) 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:in-reply-to :references; bh=+bmEuz9WXSTp3knqzD8r+ucN5jwKBlGMDMyQB8BKi6k=; b=uic8JMeYKQ4RaTmOrWiNhaRZeI85I/u0201FNEkHtz3b3R77ehQymXxXpo3fCXl+nL A2ky/aoYZHKLMIPIoNZa7hjunRz5OyI/VcO1x3XqI4Y9b2+WCwflG0meYPlTsbkGPI8R BJ8/GF6ZAPEyDQ3uEd4I44CKLkPywc8vQjHFCqrDNzYo5r0q0tRgMeIO79qgEz8j+utQ C7BCwKbYUoIpEAwkvibh9P7fMmbrzg525Vlf29xH1nfQVCC4fFMjvFxOZqw8RuacUT6a F+AAaZo7CT4nAzpHYISL51gm+Uet47j35HxhlBvwrmVM1mIk2CFdX9dSB9kwmj1qVngY Ldww== X-Received: by 10.68.185.162 with SMTP id fd2mr18275949pbc.176.1366365234712; Fri, 19 Apr 2013 02:53:54 -0700 (PDT) Received: from localhost.localdomain ([59.98.241.1]) by mx.google.com with ESMTPS id do4sm12914270pbc.8.2013.04.19.02.53.50 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 19 Apr 2013 02:53:53 -0700 (PDT) From: Prabhakar lad To: LMML Cc: Mauro Carvalho Chehab , DLOS , LKML , Hans Verkuil , "Lad, Prabhakar" Subject: [PATCH 2/2] media: davinci: vpif_display: move displaying of error to approppraite place Date: Fri, 19 Apr 2013 15:23:30 +0530 Message-Id: <1366365210-3778-3-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1366365210-3778-1-git-send-email-prabhakar.csengg@gmail.com> References: <1366365210-3778-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Lad, Prabhakar this patch moves the displaying out error case "VPIF IRQ request failed\n" when there is actual request_irq() fail. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/davinci/vpif_display.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index d833056..7b17368 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -1725,6 +1725,7 @@ static __init int vpif_probe(struct platform_device *pdev) for (j = 0; j < i; j++) free_irq(j, (void *) (&vpif_obj.dev[res_idx]->channel_id)); + vpif_err("VPIF IRQ request failed\n"); goto vpif_int_err; } } @@ -1878,7 +1879,6 @@ vpif_sd_error: } vpif_int_err: v4l2_device_unregister(&vpif_obj.v4l2_dev); - vpif_err("VPIF IRQ request failed\n"); for (i = 0; i < res_idx; i++) { res = platform_get_resource(pdev, IORESOURCE_IRQ, i); for (j = res->start; j <= res->end; j++)