korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 17:24:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] imon: fix my egregious brown paper bag w/rdev/idev split

Browse Source 
Somehow, I managed to screw things up when reworking the rdev/idev split
patch from David, and started trying to get ir_input_dev from idev
instead of rdev, thus resulting in button presses hanging the system.
This fixes it.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jarod Wilson 2010-10-23 16:42:20 -03:00 committed by Mauro Carvalho Chehab
parent cdff10a18d
commit 428cc7633d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/IR/imon.c
View File

@ -1477,7 +1477,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
bool norelease = false;
int i;
u64 scancode;
struct input_dev *idev = NULL;
struct input_dev *rdev = NULL;
struct ir_input_dev *irdev = NULL;
int press_type = 0;
int msec;
@ -1485,8 +1485,8 @@ static void imon_incoming_packet(struct imon_context *ictx,
static struct timeval prev_time = { 0, 0 };
u8 ktype;
idev = ictx->idev;
irdev = input_get_drvdata(idev);
rdev = ictx->rdev;
irdev = input_get_drvdata(rdev);
/* filter out junk data on the older 0xffdc imon devices */
if ((buf[0] == 0xff) && (buf[1] == 0xff) && (buf[2] == 0xff))
@ -1570,8 +1570,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
if (press_type == 0)
ir_keyup(irdev);
else {
ir_keydown(ictx->rdev, ictx->rc_scancode,
ictx->rc_toggle);
ir_keydown(rdev, ictx->rc_scancode, ictx->rc_toggle);
spin_lock_irqsave(&ictx->kc_lock, flags);
ictx->last_keycode = ictx->kc;
spin_unlock_irqrestore(&ictx->kc_lock, flags);
@ -1587,7 +1586,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
do_gettimeofday(&t);
msec = tv2int(&t, &prev_time);
prev_time = t;
if (msec < idev->rep[REP_DELAY]) {
if (msec < ictx->idev->rep[REP_DELAY]) {
spin_unlock_irqrestore(&ictx->kc_lock, flags);
return;
}
@ -1596,12 +1595,12 @@ static void imon_incoming_packet(struct imon_context *ictx,
spin_unlock_irqrestore(&ictx->kc_lock, flags);
input_report_key(idev, kc, press_type);
input_sync(idev);
input_report_key(ictx->idev, kc, press_type);
input_sync(ictx->idev);
/* panel keys don't generate a release */
input_report_key(idev, kc, 0);
input_sync(idev);
input_report_key(ictx->idev, kc, 0);
input_sync(ictx->idev);
ictx->last_keycode = kc;