Merge "scsi: ufs: fix probe failure masked by crypto engine reset"

This commit is contained in:
Linux Build Service Account 2015-04-20 02:16:02 -07:00 committed by Gerrit - the friendly Code Review server
commit cdbac5e22c

View File

@ -5970,7 +5970,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba)
goto out;
}
if (hba->vops && hba->vops->crypto_engine_reset) {
if (!err && hba->vops && hba->vops->crypto_engine_reset) {
err = hba->vops->crypto_engine_reset(hba);
if (err) {
dev_err(hba->dev,