From patchwork Tue Dec 18 08:28:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Prisk X-Patchwork-Id: 1890861 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 695FADF23A for ; Tue, 18 Dec 2012 08:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754446Ab2LRI3D (ORCPT ); Tue, 18 Dec 2012 03:29:03 -0500 Received: from server.prisktech.co.nz ([115.188.14.127]:55912 "EHLO server.prisktech.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754366Ab2LRI3D (ORCPT ); Tue, 18 Dec 2012 03:29:03 -0500 Received: from localhost.localdomain (unknown [192.168.0.102]) by server.prisktech.co.nz (Postfix) with ESMTP id A56E6FC093B; Tue, 18 Dec 2012 21:29:00 +1300 (NZDT) From: Tony Prisk To: Mike Turquette Cc: Tony Prisk , Kyungmin Park , Tomasz Stanislawski , linux-media@vger.kernel.org Subject: [PATCH 5/6] clk: s5p-fimc: Fix incorrect usage of IS_ERR_OR_NULL Date: Tue, 18 Dec 2012 21:28:40 +1300 Message-Id: <1355819321-21914-6-git-send-email-linux@prisktech.co.nz> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355819321-21914-1-git-send-email-linux@prisktech.co.nz> References: <1355819321-21914-1-git-send-email-linux@prisktech.co.nz> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Replace IS_ERR_OR_NULL with IS_ERR on clk_get results. Signed-off-by: Tony Prisk CC: Kyungmin Park CC: Tomasz Stanislawski CC: linux-media@vger.kernel.org --- drivers/media/platform/s5p-fimc/fimc-mdevice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 0531ab7..3ac4da2 100644 --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c @@ -730,7 +730,7 @@ static int fimc_md_get_clocks(struct fimc_md *fmd) for (i = 0; i < FIMC_MAX_CAMCLKS; i++) { snprintf(clk_name, sizeof(clk_name), "sclk_cam%u", i); clock = clk_get(NULL, clk_name); - if (IS_ERR_OR_NULL(clock)) { + if (IS_ERR(clock)) { v4l2_err(&fmd->v4l2_dev, "Failed to get clock: %s", clk_name); return -ENXIO;