From patchwork Tue Apr 27 21:11:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 95516 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3RLKVfF019177 for ; Tue, 27 Apr 2010 21:20:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756887Ab0D0VU3 (ORCPT ); Tue, 27 Apr 2010 17:20:29 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:58041 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756869Ab0D0VU2 (ORCPT ); Tue, 27 Apr 2010 17:20:28 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RLHc0C021542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Apr 2010 14:20:05 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RLBQlk020008; Tue, 27 Apr 2010 14:11:27 -0700 Message-Id: <201004272111.o3RLBQlk020008@imap1.linux-foundation.org> Subject: [patch 10/11] ir-keytable: avoid double lock To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, error27@gmail.com, dtor@mail.ru From: akpm@linux-foundation.org Date: Tue, 27 Apr 2010 14:11:26 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.504 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 27 Apr 2010 21:20:32 +0000 (UTC) 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