Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bad30783 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs-msm: probe UFS only if it is the boot device"

parents 8aa36147 59e5f511
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -2792,6 +2792,15 @@ out:
	return err;
}

#define	ANDROID_BOOT_DEV_MAX	30
static char android_boot_dev[ANDROID_BOOT_DEV_MAX];
static int get_android_boot_dev(char *str)
{
	strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX);
	return 1;
}
__setup("androidboot.bootdevice=", get_android_boot_dev);

/**
 * msm_ufs_init - bind phy with controller
 * @hba: host controller instance
@@ -2809,6 +2818,9 @@ static int msm_ufs_init(struct ufs_hba *hba)
	struct msm_ufs_phy *phy = msm_get_ufs_phy(hba->dev);
	struct msm_ufs_host *host;

	if (strlen(android_boot_dev) && strcmp(android_boot_dev, dev_name(dev)))
		return -ENODEV;

	if (IS_ERR(phy)) {
		err = PTR_ERR(phy);
		goto out;