Funny this should come up now, just after my last note. I found a patch that looks better than mine in the report filed at http://bugzilla.kernel.org/show_bug.cgi?id=6275 by Ian Dall. Alas, it was posted in March and hasn't seen any activity (including a response) since then.
Cheers, Scott