From patchwork Thu Mar 5 14:26:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 907 Return-path: X-OfflineIMAP-x1891941221-426f6d626164696c-494e424f582e6c696e75782d6d65646961: 1241215136-0334598085533-v6.0.3 X-OfflineIMAP-x755875922-4c6f63616c-496e667261646561642e6c696e75782d6d65646961: 1241139039-0816718842564-v6.0.3 Envelope-to: mchehab@infradead.org Delivery-date: Thu, 05 Mar 2009 15:52:13 +0000 Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LfF0S-0004rd-9e for mchehab@infradead.org; Thu, 05 Mar 2009 14:57:04 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681AbZCEO1E (ORCPT ); Thu, 5 Mar 2009 09:27:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753534AbZCEO1E (ORCPT ); Thu, 5 Mar 2009 09:27:04 -0500 Received: from smtp.nokia.com ([192.100.105.134]:57830 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752681AbZCEO1C (ORCPT ); Thu, 5 Mar 2009 09:27:02 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx09.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n25EQeb4030000; Thu, 5 Mar 2009 08:26:55 -0600 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 5 Mar 2009 16:26:39 +0200 Received: from mgw-int02.ntc.nokia.com ([172.21.143.97]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 5 Mar 2009 16:26:37 +0200 Received: from maxwell.research.nokia.com (maxwell.research.nokia.com [172.21.50.162]) by mgw-int02.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n25EQZQE003141; Thu, 5 Mar 2009 16:26:36 +0200 Received: from kaali.localdomain (kaali.localdomain [192.168.239.7]) by maxwell.research.nokia.com (Postfix) with ESMTP id 345597000B; Thu, 5 Mar 2009 16:26:35 +0200 (EET) Received: from sailus by kaali.localdomain with local (Exim 4.69) (envelope-from ) id 1LfEWx-0005jj-4x; Thu, 05 Mar 2009 16:26:35 +0200 From: Sakari Ailus To: dongsoo.kim@gmail.com, hvaibhav@ti.com Cc: linux-media@vger.kernel.org, saaguirre@ti.com Subject: [PATCH] omap34xxcam: Don't use dev_err before we have a video device Date: Thu, 5 Mar 2009 16:26:35 +0200 Message-Id: <1236263195-22033-1-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <19F8576C6E063C45BE387C64729E73940427BCA20A@dbde02.ent.ti.com> References: <19F8576C6E063C45BE387C64729E73940427BCA20A@dbde02.ent.ti.com> X-OriginalArrivalTime: 05 Mar 2009 14:26:37.0735 (UTC) FILETIME=[64BE3370:01C99D9E] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Also return -ENOMEM instead of -ENODEV if kzalloc fails. Thanks to Alexey Klimov for noticing this. Signed-off-by: Sakari Ailus --- drivers/media/video/omap34xxcam.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/video/omap34xxcam.c b/drivers/media/video/omap34xxcam.c index 586718a..8398819 100644 --- a/drivers/media/video/omap34xxcam.c +++ b/drivers/media/video/omap34xxcam.c @@ -1793,8 +1793,8 @@ static int omap34xxcam_device_register(struct v4l2_int_device *s) mutex_lock(&vdev->mutex); if (atomic_read(&vdev->users)) { - dev_err(&vdev->vfd->dev, "we're open (%d), can't register\n", - atomic_read(&vdev->users)); + printk(KERN_ERR "%s: we're open (%d), can't register\n", + __func__, atomic_read(&vdev->users)); mutex_unlock(&vdev->mutex); return -EBUSY; } @@ -1806,8 +1806,8 @@ static int omap34xxcam_device_register(struct v4l2_int_device *s) if (hwc.dev_type == OMAP34XXCAM_SLAVE_SENSOR) { rval = isp_get(); if (rval < 0) { - dev_err(&vdev->vfd->dev, - "can't get ISP, sensor init failed\n"); + printk(KERN_ERR "%s: can't get ISP, " + "sensor init failed\n", __func__); goto err; } } @@ -1837,8 +1837,8 @@ static int omap34xxcam_device_register(struct v4l2_int_device *s) /* initialize the video_device struct */ vdev->vfd = video_device_alloc(); if (!vdev->vfd) { - dev_err(&vdev->vfd->dev, - "could not allocate video device struct\n"); + printk(KERN_ERR "%s: could not allocate " + "video device struct\n", __func__); return -ENOMEM; } vdev->vfd->release = video_device_release; @@ -1849,8 +1849,8 @@ static int omap34xxcam_device_register(struct v4l2_int_device *s) if (video_register_device(vdev->vfd, VFL_TYPE_GRABBER, hwc.dev_minor) < 0) { - dev_err(&vdev->vfd->dev, - "could not register V4L device\n"); + printk(KERN_ERR "%s: could not register V4L device\n", + __func__); vdev->vfd->minor = -1; rval = -EBUSY; goto err; @@ -1919,7 +1919,7 @@ static int __init omap34xxcam_init(void) cam = kzalloc(sizeof(*cam), GFP_KERNEL); if (!cam) { printk(KERN_ERR "%s: could not allocate memory\n", __func__); - goto err; + return -ENOMEM; } omap34xxcam = cam;