From patchwork Sat Mar 17 17:36:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 10390 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1S8xaW-00077l-Hn for patchwork@linuxtv.org; Sat, 17 Mar 2012 18:38:44 +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-3) with esmtp for id 1S8xaW-0007Qx-DC; Sat, 17 Mar 2012 18:38:44 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757159Ab2CQRi2 (ORCPT ); Sat, 17 Mar 2012 13:38:28 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:35631 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752578Ab2CQRiZ (ORCPT ); Sat, 17 Mar 2012 13:38:25 -0400 Received: by dajr28 with SMTP id r28so7759085daj.19 for ; Sat, 17 Mar 2012 10:38:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=8cGMloeOy1ZX+Xcd144eNyDsTYtKyK51wjz14tyL/BA=; b=QDmHlHHgrgjXy0SJpnDo3qwxC+PYaFuhgX7bREeHxw+SxS298ywFVeKELQvcqKnwS4 Y1GpTipcvz0hU+DX8zvI/cLYtKHRGcB7hJ46W8ndLwDg8HUWpq7ELobwh3msY3gxAsZL KGNdJB8C9YVUDnN+/jydPI5MXfgcuUGkdHN6ZpeXzRIOTQYp0OJTIYizmRfaCM3UwFHG vOISOSL6rSuohwueLd4fJf+krlE3Dx6II/p81TGPFNeAa0WS1oynf8dRMJ0kKXPgMBBG qK7OEnp6mx0rPSGl8Pi83wDbEeMCHKTa+88Csxv649smWNgKCEA1lzN8HCWFEVCxAdF1 VRWg== Received: by 10.68.134.168 with SMTP id pl8mr10592052pbb.16.1332005904735; Sat, 17 Mar 2012 10:38:24 -0700 (PDT) Received: from localhost.localdomain ([14.97.26.77]) by mx.google.com with ESMTPS id k3sm7076149pbd.17.2012.03.17.10.38.20 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 17 Mar 2012 10:38:24 -0700 (PDT) From: santosh nayak To: mchehab@infradead.org Cc: oliver@neukum.org, gregkh@linuxfoundation.org, khoroshilov@ispras.ru, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Santosh Nayak Subject: [PATCH] [media] staging: use mutex_lock() in s2250_probe(). Date: Sat, 17 Mar 2012 23:06:57 +0530 Message-Id: <1332005817-10762-1-git-send-email-santoshprasadnayak@gmail.com> X-Mailer: git-send-email 1.7.4.4 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: 2012.3.17.172717 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_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Santosh Nayak Use uninterruptable sleep lock 'mutex_lock()' in place of mutex_lock_interruptible() because there is no userspace for s2250_probe(). Return -ENOMEM if kzalloc() fails to allocate and initialize. Signed-off-by: Santosh Nayak --- drivers/staging/media/go7007/s2250-board.c | 43 +++++++++++++++------------ 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/staging/media/go7007/s2250-board.c b/drivers/staging/media/go7007/s2250-board.c index 014d384..1406a37 100644 --- a/drivers/staging/media/go7007/s2250-board.c +++ b/drivers/staging/media/go7007/s2250-board.c @@ -637,27 +637,32 @@ static int s2250_probe(struct i2c_client *client, state->audio_input = 0; write_reg(client, 0x08, 0x02); /* Line In */ - if (mutex_lock_interruptible(&usb->i2c_lock) == 0) { - data = kzalloc(16, GFP_KERNEL); - if (data != NULL) { - int rc; - rc = go7007_usb_vendor_request(go, 0x41, 0, 0, - data, 16, 1); - if (rc > 0) { - u8 mask; - data[0] = 0; - mask = 1<<5; - data[0] &= ~mask; - data[1] |= mask; - go7007_usb_vendor_request(go, 0x40, 0, - (data[1]<<8) - + data[1], - data, 16, 0); - } - kfree(data); - } + mutex_lock(&usb->i2c_lock); + data = kzalloc(16, GFP_KERNEL); + if (data == NULL) { + i2c_unregister_device(audio); + kfree(state); mutex_unlock(&usb->i2c_lock); + return -ENOMEM; + } else { + int rc; + rc = go7007_usb_vendor_request(go, 0x41, 0, 0, + data, 16, 1); + if (rc > 0) { + u8 mask; + data[0] = 0; + mask = 1<<5; + data[0] &= ~mask; + data[1] |= mask; + go7007_usb_vendor_request(go, 0x40, 0, + (data[1]<<8) + + data[1], + data, 16, 0); + } + kfree(data); } + mutex_unlock(&usb->i2c_lock); + v4l2_info(sd, "initialized successfully\n"); return 0;