summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-01-04 10:26:10 +0300
committerDave Airlie <airlied@redhat.com>2012-01-10 10:01:22 +0000
commit96067adf55bd93618cec4b6de08aebaad8203c9b (patch)
tree1ddabb7a000e5ffd6702a6afaecbb2d2e3238e4b /drivers
parent7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1 (diff)
gma500: silence gcc warnings in mid_get_vbt_data()
Add a cast here to silence a Gcc warning. drivers/gpu/drm/gma500/mid_bios.c:214:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/gma500/mid_bios.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index 55fee10eefff..5eee9ad80da4 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -202,7 +202,7 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
/*so, some values have changed location*/
new_size = vbt->checksum; /*checksum contains lo size byte*/
/*LSB of oaktrail_gct contains hi size byte*/
- new_size |= ((0xff & (unsigned int)vbt->oaktrail_gct)) << 8;
+ new_size |= ((0xff & (unsigned int)(long)vbt->oaktrail_gct)) << 8;
vbt->checksum = vbt->size; /*size contains the checksum*/
if (new_size > 0xff)
@@ -211,8 +211,8 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
vbt->size = new_size;
/* number of descriptors defined in the GCT */
- number_desc = ((0xff00 & (unsigned int)vbt->oaktrail_gct)) >> 8;
- bpi = ((0xff0000 & (unsigned int)vbt->oaktrail_gct)) >> 16;
+ number_desc = ((0xff00 & (unsigned int)(long)vbt->oaktrail_gct)) >> 8;
+ bpi = ((0xff0000 & (unsigned int)(long)vbt->oaktrail_gct)) >> 16;
vbt->oaktrail_gct = ioremap(addr + GCT_R10_HEADER_SIZE,
GCT_R10_DISPLAY_DESC_SIZE * number_desc);
pGCT = vbt->oaktrail_gct;