Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / drivers / video / sstfb.c

diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 59cd1e750f30dc595f96271277587ae151eab31c..62fa5500361d2a1b8a1ce7418c1b81f9d1044d1b 100644 (file)
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -257,6 +257,7 @@ static void __sst_dac_write(u8 __iomem *vbase, u8 reg, u8 val)
        r_dprintk("sst_dac_write(%#x, %#x)\n", reg, val);
        reg &= 0x07;
        __sst_write(vbase, DAC_DATA,(((u32)reg << 8)) | (u32)val);
+       __sst_wait_idle(vbase);
 }
 
 /* indexed access to ti/att dacs */