Skip to contentSkip to conversation

ov511: fix probe() hang due to double mutex_lock

PATCH In review Brandon Philips 2 participants 3 messages Dec 11, 2009 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ov511: fix probe() hang due to double mutex_lock

Commit 163fe744c3283fd267268629afff4cfc846ed0e0 added a double mutex_lock which hangs ov51x_probe(). This was clearly a typo.

Change final mutex_lock() -> mutex_unlock()

---
 drivers/media/video/ov511.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/ov511.c +1 -1
index 0bc2cf5..2bed9e2 100644
@@ -5878,7 +5878,7 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
 		goto error;
 	}
 
-	mutex_lock(&ov->lock);
+	mutex_unlock(&ov->lock);
 
 	return 0;
 
Signature · 1 line
1.6.4.2
#1 lore raw
Quoted 6 lines · Brandon Philips

Commit 163fe744c3283fd267268629afff4cfc846ed0e0 added a double mutex_lock which hangs ov51x_probe(). This was clearly a typo.

Change final mutex_lock() -> mutex_unlock()

Brandon, when you want patches to be added to the stable tree, just add a:
Cc: stable <[email protected]>
to the signed-off-by area of the patch. That way, when they get merged into Linus's tree eventually, they will be automagically sent to the [email protected] alias, so I know to add it to the tree at that time.

It saves you time, and me time, so I don't have to go hunt for this upstream sometime in the future.

thanks,

greg "i need more time saved" k-h

#2 lore raw
Quoted 15 lines · Greg KH
Quoted 6 lines · Brandon Philips

Commit 163fe744c3283fd267268629afff4cfc846ed0e0 added a double mutex_lock which hangs ov51x_probe(). This was clearly a typo.

Change final mutex_lock() -> mutex_unlock()

Brandon, when you want patches to be added to the stable tree, just add a:
Cc: stable <[email protected]>
to the signed-off-by area of the patch. That way, when they get merged into Linus's tree eventually, they will be automagically sent to the [email protected] alias, so I know to add it to the tree at that time.

Quoted 2 lines

It saves you time, and me time, so I don't have to go hunt for this upstream sometime in the future.

That is a handy feature. It might be nice to document it in the -stable documentation. See patch below for an attempt.

I will ping stable again on this patch once this reaches Linus's tree so you don't need to track it. Sorry for messing up the stable procedure. :D

Thanks,

Brandon

Documentation/stable_kernel_rules.txt +17 -0
index a452227..5d24504 100644
@@ -36,6 +36,23 @@ Procedure for submitting patches to the -stable tree:
  - Security patches should not be sent to this alias, but instead to the
    documented [email protected] address.
 
+Submitting to -stable automatically upon reaching Linus's tree:
+
+ - As mentioned above, patches must be merged into Linus's tree before being
+   considered for -stable. But, if you are sending a patch for inclusion
+   into Linus's tree that you know you will eventually submit to -stable when
+   it is merged then you can save yourself the trouble of tracking the patch by
+   adding:
+
+     Cc: stable <[email protected]>
+
+   in the signed-off-by area of the patch. Then once it is merged with Linus
+   an email with the patch will be sent to [email protected] automatically.
+
+   This only works for patches that are for both -stable and Linus's tree at
+   the time of submission. If a fix has already made its way into Linus's tree
+   or a maintainer's queue for Linus's tree then follow the regular submission
+   rules outlined above.
 
 Review cycle: