From: Marek VaĊĦut Date: Wed, 26 May 2010 22:53:09 +0000 (+0100) Subject: ARM: 6146/1: sa1111: Prevent deadlock in resume path X-Git-Tag: v2.6.35-rc3~14^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3defb2476166445982a90c12d33f8947e75476c4;p=pandora-kernel.git ARM: 6146/1: sa1111: Prevent deadlock in resume path This patch reorganises the sa1111_resume() function in a manner the spinlock happens after calling the sa1111_wake(). This fixes two bugs: 1) This function called sa1111_wake() which tried to claim the same spinlock the sa1111_resume() already claimed. This would result in certain deadlock. Original idea for this part: Russell King 2) The function didn't unlock the spinlock in case the chip didn't report correct ID. Original idea for this part: Julia Lawall Signed-off-by: Marek Vasut Cc: Signed-off-by: Russell King --- Reading git-diff-tree failed