diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
| commit | bab66e96641aeadf263ec443dbcc57090a664dea (patch) | |
| tree | 5aacb65407cf1ed65b28267b8a08a1d0b5408a91 /drivers/video | |
| parent | 6056dff4c5196b7c7a24ba6079155e400074cdf3 (diff) | |
| parent | 80f04edd1db9e64fc5310130b9b2c95b965ec9c9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index 556d96ce40bf..89a8a89a5eb2 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h @@ -698,7 +698,7 @@ void matroxfb_unregister_driver(struct matroxfb_driver* drv); #define mga_fifo(n) do {} while ((mga_inl(M_FIFOSTATUS) & 0xFF) < (n)) -#define WaitTillIdle() do {} while (mga_inl(M_STATUS) & 0x10000) +#define WaitTillIdle() do { mga_inl(M_STATUS); do {} while (mga_inl(M_STATUS) & 0x10000); } while (0) /* code speedup */ #ifdef CONFIG_FB_MATROX_MILLENIUM |