Merge "mmc: host: fix issue with new pm code"