Merge "mmc: fix for cmd6 failure"