ARM: 6146/1: sa1111: Prevent deadlock in resume path
authorMarek Vašut <marek.vasut@gmail.com>
Wed, 26 May 2010 22:53:09 +0000 (23:53 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 27 May 2010 09:36:08 +0000 (10:36 +0100)
commit3defb2476166445982a90c12d33f8947e75476c4
treefb5b7b157f741cf2cfcc7436c5d70bd5ae7f53a7
parentba327b1e5296b70745e50bcf0446ae8f82e3d478
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 <rmk+kernel@arm.linux.org.uk>

2) The function didn't unlock the spinlock in case the chip didn't report
   correct ID.

   Original idea for this part: Julia Lawall <julia@diku.dk>

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/common/sa1111.c