From 9dbc99cbf5137e3a2de9d8dd5f1493584627b938 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 29 Sep 2005 19:26:51 -0700 Subject: [PATCH] --- yaml --- r: 9495 b: refs/heads/master c: 017fb98e70351e9fb5635c299c4d1c50e2f8b823 h: refs/heads/master i: 9493: 04f7eb6026367b1f469f4888721129c0dd1bff72 9491: 7e18a247de62e66d605215afb9d483a03ea0874d 9487: aca130984d4d1dbddd507ca0f129f2962226d6c9 v: v3 --- [refs] | 2 +- trunk/drivers/video/aty/radeon_base.c | 2 +- trunk/drivers/video/aty/radeonfb.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dd79fb1f6ba5..2399b3215383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 717463d806a53380a691eeb0136a4b750a9f9ae0 +refs/heads/master: 017fb98e70351e9fb5635c299c4d1c50e2f8b823 diff --git a/trunk/drivers/video/aty/radeon_base.c b/trunk/drivers/video/aty/radeon_base.c index 046b47860266..8a24a66d9ba8 100644 --- a/trunk/drivers/video/aty/radeon_base.c +++ b/trunk/drivers/video/aty/radeon_base.c @@ -475,7 +475,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo) */ /* Flush PCI buffers ? */ - tmp = INREG(DEVICE_ID); + tmp = INREG16(DEVICE_ID); local_irq_disable(); diff --git a/trunk/drivers/video/aty/radeonfb.h b/trunk/drivers/video/aty/radeonfb.h index 659bc9f62244..01b8b2f78514 100644 --- a/trunk/drivers/video/aty/radeonfb.h +++ b/trunk/drivers/video/aty/radeonfb.h @@ -395,6 +395,8 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) #define INREG8(addr) readb((rinfo->mmio_base)+addr) #define OUTREG8(addr,val) writeb(val, (rinfo->mmio_base)+addr) +#define INREG16(addr) readw((rinfo->mmio_base)+addr) +#define OUTREG16(addr,val) writew(val, (rinfo->mmio_base)+addr) #define INREG(addr) readl((rinfo->mmio_base)+addr) #define OUTREG(addr,val) writel(val, (rinfo->mmio_base)+addr)