[PATCH] Fix some locking issues.

[<th...@tu...>]

Hi!

I'm posting a patch relating to bugzilla Bug #9457
https://bugs.freedesktop.org/show_bug.cgi?id=9457

Since it involves the hardware lock operation I'd like it to be reviewed 
before committing.

/Thomas