Let's do the changes properly and fix the same problem everywhere, not
just for one case.

Cc: <stable@vger.kernel.org> # kernels containing 15e0d9e3 or equivalent
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>