Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4330
b: refs/heads/master
c: 3461215
h: refs/heads/master
v: v3
  • Loading branch information
Oliver Endriss authored and Linus Torvalds committed Jul 8, 2005
1 parent e622d87 commit 0df6116
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7a2fa90fa8084846937aa194f8a40abfa99c692f
refs/heads/master: 34612157b48d38e85ff72d65291b9eecb44dd0a6
7 changes: 4 additions & 3 deletions trunk/drivers/media/dvb/ttpci/av7110.c
Original file line number Diff line number Diff line change
Expand Up @@ -2038,15 +2038,13 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)
if (av7110->fe_synced == synced)
return 0;

av7110->fe_synced = synced;

if (av7110->playing)
return 0;

if (down_interruptible(&av7110->pid_mutex))
return -ERESTARTSYS;

if (av7110->fe_synced) {
if (synced) {
ret = SetPIDs(av7110, av7110->pids[DMX_PES_VIDEO],
av7110->pids[DMX_PES_AUDIO],
av7110->pids[DMX_PES_TELETEXT], 0,
Expand All @@ -2062,6 +2060,9 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)
}
}

if (!ret)
av7110->fe_synced = synced;

up(&av7110->pid_mutex);
return ret;
}
Expand Down

0 comments on commit 0df6116

Please sign in to comment.