Patch from Nicolas Pitre

... also remove an unused variable warning.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King