Merge "mmc: sdhci-msm-ice: Fix compilation issue" (4e7999fc) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/host/sdhci-msm-ice.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -351,12 +351,16 @@ int sdhci_msm_ice_cfg(struct sdhci_host host, struct mmc_request mrq,
		return -EINVAL;
		req = mrq->req;
		if (req && req->bio) {
		#ifdef CONFIG_PFK
		if (bio_dun(req->bio)) {
		dun = bio_dun(req->bio);
		cdu_sz = SDHCI_MSM_ICE_TR_DATA_UNIT_4_KB;
		} else {
		dun = req->__sector;
		}
		#else
		dun = req->__sector;
		#endif
		err = sdhci_msm_ice_get_cfg(msm_host, req, &bypass, &key_index);
		if (err)
		return err;
		@@ -401,12 +405,16 @@ int sdhci_msm_ice_cmdq_cfg(struct sdhci_host *host,
		return -EINVAL;
		req = mrq->req;
		if (req && req->bio) {
		#ifdef CONFIG_PFK
		if (bio_dun(req->bio)) {
		dun = bio_dun(req->bio);
		cdu_sz = SDHCI_MSM_ICE_TR_DATA_UNIT_4_KB;
		} else {
		dun = req->__sector;
		}
		#else
		dun = req->__sector;
		#endif
		err = sdhci_msm_ice_get_cfg(msm_host, req, &bypass, &key_index);
		if (err)
		return err;