projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: Fix bug in 4K EEPROM size calculation
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
atafb.c
diff --git
a/drivers/video/atafb.c
b/drivers/video/atafb.c
index 8058572a74283303f178d03d0e97e64632c85099..018850c116c646edbeadf5cc6e4fc828e3901eff 100644
(file)
--- a/
drivers/video/atafb.c
+++ b/
drivers/video/atafb.c
@@
-841,7
+841,7
@@
static int tt_detect(void)
tt_dmasnd.ctrl = DMASND_CTRL_OFF;
udelay(20); /* wait a while for things to settle down */
}
tt_dmasnd.ctrl = DMASND_CTRL_OFF;
udelay(20); /* wait a while for things to settle down */
}
- mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+ mono_moni = (
st_
mfp.par_dt_reg & 0x80) == 0;
tt_get_par(&par);
tt_encode_var(&atafb_predefined[0], &par);
tt_get_par(&par);
tt_encode_var(&atafb_predefined[0], &par);
@@
-2035,7
+2035,7
@@
static int stste_detect(void)
tt_dmasnd.ctrl = DMASND_CTRL_OFF;
udelay(20); /* wait a while for things to settle down */
}
tt_dmasnd.ctrl = DMASND_CTRL_OFF;
udelay(20); /* wait a while for things to settle down */
}
- mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+ mono_moni = (
st_
mfp.par_dt_reg & 0x80) == 0;
stste_get_par(&par);
stste_encode_var(&atafb_predefined[0], &par);
stste_get_par(&par);
stste_encode_var(&atafb_predefined[0], &par);
@@
-2086,20
+2086,20
@@
static void st_ovsc_switch(void)
return;
local_irq_save(flags);
return;
local_irq_save(flags);
- mfp.tim_ct_b = 0x10;
- mfp.active_edge |= 8;
- mfp.tim_ct_b = 0;
- mfp.tim_dt_b = 0xf0;
- mfp.tim_ct_b = 8;
- while (
mfp.tim_dt_b > 1)
/* TOS does it this way, don't ask why */
+
st_
mfp.tim_ct_b = 0x10;
+
st_
mfp.active_edge |= 8;
+
st_
mfp.tim_ct_b = 0;
+
st_
mfp.tim_dt_b = 0xf0;
+
st_
mfp.tim_ct_b = 8;
+ while (
st_mfp.tim_dt_b > 1)
/* TOS does it this way, don't ask why */
;
;
- new = mfp.tim_dt_b;
+ new =
st_
mfp.tim_dt_b;
do {
udelay(LINE_DELAY);
old = new;
do {
udelay(LINE_DELAY);
old = new;
- new = mfp.tim_dt_b;
+ new =
st_
mfp.tim_dt_b;
} while (old != new);
} while (old != new);
- mfp.tim_ct_b = 0x10;
+
st_
mfp.tim_ct_b = 0x10;
udelay(SYNC_DELAY);
if (atari_switches & ATARI_SWITCH_OVSC_IKBD)
udelay(SYNC_DELAY);
if (atari_switches & ATARI_SWITCH_OVSC_IKBD)