From aa123c0f288c25c5fe467ef6d07304f38a8bee3c Mon Sep 17 00:00:00 2001 From: Ivan Priest Date: Mon, 11 Jun 2018 16:26:22 +0100 Subject: [PATCH] [9610] wlbt: fix CTRL_NS ownership and whitespace CTRL_NS ownership wasn't taken by WLBT on UNIV due to merge error in previous patch. Also fix the whitespace issue on the previous patch. Change-Id: I92434781693ca74daafc7bb15ff80eec289109b1 SCSC-Bug-Id: SSB-40135 Signed-off-by: Ivan Priest --- drivers/misc/samsung/scsc/platform_mif.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/misc/samsung/scsc/platform_mif.c b/drivers/misc/samsung/scsc/platform_mif.c index 4c29262209d6..292e9fe34aa3 100755 --- a/drivers/misc/samsung/scsc/platform_mif.c +++ b/drivers/misc/samsung/scsc/platform_mif.c @@ -1243,14 +1243,13 @@ static int platform_mif_pmu_reset(struct scsc_mif_abs *interface, u8 rst_case) SCSC_TAG_INFO_DEV(PLAT_MIF, platform->dev, "rst_case %d\n", rst_case); /* Revert power control ownership to AP, as WLBT is going down (S9.6.6). */ - ret = regmap_update_bits(platform->pmureg, WLBT_CTRL_NS, - MASK_PWR_REQ, MASK_PWR_REQ); - if (ret < 0) { - SCSC_TAG_ERR_DEV(PLAT_MIF, platform->dev, - "Failed to update WLBT_CTRL_NS[MASK_PWR_REQ]: %d\n", ret); - return ret; - } - + ret = regmap_update_bits(platform->pmureg, WLBT_CTRL_NS, + MASK_PWR_REQ, MASK_PWR_REQ); + if (ret < 0) { + SCSC_TAG_ERR_DEV(PLAT_MIF, platform->dev, + "Failed to update WLBT_CTRL_NS[MASK_PWR_REQ]: %d\n", ret); + return ret; + } /* reset sequence as per excite implementation for Leman */ ret = regmap_update_bits(platform->pmureg, CENTRAL_SEQ_WLBT_CONFIGURATION, -- 2.20.1