Patch from Nicolas Pitre

This is an alternative to patch #1843/1 keeping the ugliness
(and possible future breakage) to the affected driver only.
This one should be applied after patch #1830/2.