diff --git a/[refs] b/[refs]
index e48833459ee1..2e693f17f651 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e36ed00842668a39a6ed1b0a00b8ac92b7c4cd5
+refs/heads/master: 669899878cfe0cd0c1fe60104f3d39b95a80e1d8
diff --git a/trunk/drivers/gpu/drm/radeon/r600_hdmi.c b/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
index 40b1aca6d1f4..26b4bc9d89a5 100644
--- a/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/trunk/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -539,7 +539,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
 	struct drm_device *dev = encoder->dev;
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-	uint8_t offset;
+	uint32_t offset;
 
 	if (ASIC_IS_DCE4(rdev))
 		return;