aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ttpci')
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 515e8232e020..a468aa2e4854 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -978,24 +978,24 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble
978 978
979static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last) 979static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last)
980{ 980{
981 int i; 981 int i;
982 int length = last - first + 1; 982 int length = last - first + 1;
983 983
984 if (length * 4 > DATA_BUFF3_SIZE) 984 if (length * 4 > DATA_BUFF3_SIZE)
985 return -EINVAL; 985 return -EINVAL;
986 986
987 for (i = 0; i < length; i++) { 987 for (i = 0; i < length; i++) {
988 u32 color, blend, yuv; 988 u32 color, blend, yuv;
989 989
990 if (get_user(color, colors + i)) 990 if (get_user(color, colors + i))
991 return -EFAULT; 991 return -EFAULT;
992 blend = (color & 0xF0000000) >> 4; 992 blend = (color & 0xF0000000) >> 4;
993 yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF, 993 yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF,
994 (color >> 16) & 0xFF) | blend : 0; 994 (color >> 16) & 0xFF) | blend : 0;
995 yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16); 995 yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16);
996 wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4); 996 wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4);
997 } 997 }
998 return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4, 998 return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4,
999 av7110->osdwin, 999 av7110->osdwin,
1000 bpp2pal[av7110->osdbpp[av7110->osdwin]], 1000 bpp2pal[av7110->osdbpp[av7110->osdwin]],
1001 first, last); 1001 first, last);