leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] ir: Fix IR_MAX_DURATION enforcement

Browse Source 
Don't assume that IR_MAX_DURATION is a bitmask. It isn't.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-06-05 10:25:24 -03:00
parent 485bdbb6b8
commit 95cf60aa55
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/rc/redrat3.c
View File

@ -322,7 +322,7 @@ static u32 redrat3_us_to_len(u32 microsec)
u32 result; u32 result;
u32 divisor; u32 divisor;
microsec &= IR_MAX_DURATION; microsec = (microsec > IR_MAX_DURATION) ? IR_MAX_DURATION : microsec;
divisor = (RR3_CLK_CONV_FACTOR / 1000); divisor = (RR3_CLK_CONV_FACTOR / 1000);
result = (u32)(microsec * divisor) / 1000; result = (u32)(microsec * divisor) / 1000;
@ -380,7 +380,8 @@ static void redrat3_process_ir_data(struct redrat3_dev *rr3)
if (i == 0) if (i == 0)
trailer = rawir.duration; trailer = rawir.duration;
/* cap the value to IR_MAX_DURATION */ /* cap the value to IR_MAX_DURATION */
rawir.duration &= IR_MAX_DURATION; rawir.duration = (rawir.duration > IR_MAX_DURATION) ?
IR_MAX_DURATION : rawir.duration;
dev_dbg(dev, "storing %s with duration %d (i: %d)\n", dev_dbg(dev, "storing %s with duration %d (i: %d)\n",
rawir.pulse ? "pulse" : "space", rawir.duration, i); rawir.pulse ? "pulse" : "space", rawir.duration, i);

6
drivers/media/rc/streamzap.c
View File

@ -152,7 +152,8 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
sz->signal_last.tv_usec); sz->signal_last.tv_usec);
rawir.duration -= sz->sum; rawir.duration -= sz->sum;
rawir.duration = US_TO_NS(rawir.duration); rawir.duration = US_TO_NS(rawir.duration);
rawir.duration &= IR_MAX_DURATION; rawir.duration = (rawir.duration > IR_MAX_DURATION) ?
IR_MAX_DURATION : rawir.duration;
} }
sz_push(sz, rawir); sz_push(sz, rawir);
@ -165,7 +166,8 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
rawir.duration += SZ_RESOLUTION / 2; rawir.duration += SZ_RESOLUTION / 2;
sz->sum += rawir.duration; sz->sum += rawir.duration;
rawir.duration = US_TO_NS(rawir.duration); rawir.duration = US_TO_NS(rawir.duration);
rawir.duration &= IR_MAX_DURATION; rawir.duration = (rawir.duration > IR_MAX_DURATION) ?
IR_MAX_DURATION : rawir.duration;
sz_push(sz, rawir); sz_push(sz, rawir);
} }