[PATCH 21/21] sbi

[Chris Wilson]

---
 drivers/gpu/drm/i915/intel_sideband.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c
index 6815be9e5b7c..b36f6701d4b2 100644
--- a/drivers/gpu/drm/i915/intel_sideband.c
+++ b/drivers/gpu/drm/i915/intel_sideband.c
@@ -324,7 +324,7 @@ static int intel_sbi_rw(struct drm_i915_private *dev_priv, u16 reg,
 		return -EBUSY;
 	}
 
-	I915_WRITE_FW(SBI_ADDR, reg << 16);
+	I915_WRITE_FW(SBI_ADDR, (u32)reg << 16);
 	I915_WRITE_FW(SBI_DATA, is_read ? 0 : *val);
 
 	if (destination == SBI_ICLK)
@@ -336,7 +336,6 @@ static int intel_sbi_rw(struct drm_i915_private *dev_priv, u16 reg,
 	if (__intel_wait_for_register_fw(dev_priv,
 					 SBI_CTL_STAT, SBI_BUSY, 0,
 					 100, 100, &cmd)) {
-
 		DRM_ERROR("timeout waiting for SBI to complete read\n");
 		return -ETIMEDOUT;
 	}
-- 
2.15.1