Re: [patch 10/11] ir-keytable: avoid double lock

[Dan Carpenter]

On Mon, May 03, 2010 at 08:07:29PM -0300, Mauro Carvalho Chehab wrote:
 a...@linux-foundation.org wrote:
  From: Dan Carpenter erro...@gmail.com
  
  It's possible that we wanted to resize to a smaller size but we didn't
  have enough memory to create the new table.  We need to test for that here
  so we don't try to lock twice and dead lock.  Also we free the oldkeymap
  on that path and that would be bad.
 
 This patch doesn't apply anymore on my tree.
 
 It probably conflicted with this one:
 

Yup.  It's no longer needed.  Looks good.

regards,
dan carpenter


--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch 10/11] ir-keytable: avoid double lock

[Mauro Carvalho Chehab]

a...@linux-foundation.org wrote:
 From: Dan Carpenter erro...@gmail.com
 
 It's possible that we wanted to resize to a smaller size but we didn't
 have enough memory to create the new table.  We need to test for that here
 so we don't try to lock twice and dead lock.  Also we free the oldkeymap
 on that path and that would be bad.

This patch doesn't apply anymore on my tree.

It probably conflicted with this one:

commit 2b12a23223d05a1192e1e55775b79d6caa52b066
Author: David Härdeman da...@hardeman.nu
Date:   Fri Apr 2 15:58:28 2010 -0300

V4L/DVB: drivers/media/IR - improve keytable code

The attached patch rewrites much of the keytable code in
drivers/media/IR/ir-keytable.c.


Cheers,
Mauro
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[patch 10/11] ir-keytable: avoid double lock

[akpm]

From: Dan Carpenter erro...@gmail.com

It's possible that we wanted to resize to a smaller size but we didn't
have enough memory to create the new table.  We need to test for that here
so we don't try to lock twice and dead lock.  Also we free the oldkeymap
on that path and that would be bad.

Signed-off-by: Dan Carpenter erro...@gmail.com
Cc: Mauro Carvalho Chehab mche...@infradead.org
Cc: Dmitry Torokhov d...@mail.ru
Signed-off-by: Andrew Morton a...@linux-foundation.org
---

 drivers/media/IR/ir-keytable.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/media/IR/ir-keytable.c~ir-keytable-avoid-double-lock 
drivers/media/IR/ir-keytable.c
--- a/drivers/media/IR/ir-keytable.c~ir-keytable-avoid-double-lock
+++ a/drivers/media/IR/ir-keytable.c
@@ -217,7 +217,7 @@ static void ir_delete_key(struct ir_scan
memcpy(newkeymap[elem], oldkeymap[elem + 1],
   (newsize - elem) * sizeof(*newkeymap));
 
-   if (resize) {
+   if (resize  newkeymap != oldkeymap) {
/*
 * As the copy happened to a temporary table, only here
 * it needs to lock while replacing the table pointers
_
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html