[9610] wlbt: fix CTRL_NS ownership and whitespace
authorIvan Priest <i.priest@samsung.com>
Mon, 11 Jun 2018 15:26:22 +0000 (16:26 +0100)
committerTarun Karela <t.karela@samsung.com>
Fri, 22 Jun 2018 08:49:30 +0000 (09:49 +0100)
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 <i.priest@samsung.com>
drivers/misc/samsung/scsc/platform_mif.c

index 4c29262209d6a42c3ae968a7a1b906ad6b4d87eb..292e9fe34aa36d4a5213fc33e53c5b431a5c0e4f 100755 (executable)
@@ -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,