Cherry-pick fix for hsmmc hang from 3.12

Signed-off-by: Charles Steinkuehler <charles@steinkuehler.net>