mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: santosh nayak <santoshprasadnayak@gmail.com>
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 <santoshprasadnayak@gmail.com>
Subject: [PATCH] [media] staging: use mutex_lock() in s2250_probe().
Date: Sat, 17 Mar 2012 23:06:57 +0530	[thread overview]
Message-ID: <1332005817-10762-1-git-send-email-santoshprasadnayak@gmail.com> (raw)

From: Santosh Nayak <santoshprasadnayak@gmail.com>

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 <santoshprasadnayak@gmail.com>
---
 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;
-- 
1.7.4.4


             reply	other threads:[~2012-03-17 17:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-17 17:36 santosh nayak [this message]
2012-03-18 14:43 ` walter harms
2012-03-18 16:04   ` santosh prasad nayak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332005817-10762-1-git-send-email-santoshprasadnayak@gmail.com \
    --to=santoshprasadnayak@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=khoroshilov@ispras.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=oliver@neukum.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®