diff options
author | Oliver Endriss <o.endriss@gmx.de> | 2005-07-07 20:58:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:58 -0400 |
commit | 34612157b48d38e85ff72d65291b9eecb44dd0a6 (patch) | |
tree | 22b58e6ed2067a717ff17eb34cc6249f3387b60f /drivers/media/dvb | |
parent | 7a2fa90fa8084846937aa194f8a40abfa99c692f (diff) |
[PATCH] dvb: ttpci: make av7110_fe_lock_fix() retryable
av7110_fe_lock_fix() modified in a way that it can be retried after
-ERESTARTSYS
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index ab4f77d73edc..e4c6e87f6c5d 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -2038,15 +2038,13 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status) | |||
2038 | if (av7110->fe_synced == synced) | 2038 | if (av7110->fe_synced == synced) |
2039 | return 0; | 2039 | return 0; |
2040 | 2040 | ||
2041 | av7110->fe_synced = synced; | ||
2042 | |||
2043 | if (av7110->playing) | 2041 | if (av7110->playing) |
2044 | return 0; | 2042 | return 0; |
2045 | 2043 | ||
2046 | if (down_interruptible(&av7110->pid_mutex)) | 2044 | if (down_interruptible(&av7110->pid_mutex)) |
2047 | return -ERESTARTSYS; | 2045 | return -ERESTARTSYS; |
2048 | 2046 | ||
2049 | if (av7110->fe_synced) { | 2047 | if (synced) { |
2050 | ret = SetPIDs(av7110, av7110->pids[DMX_PES_VIDEO], | 2048 | ret = SetPIDs(av7110, av7110->pids[DMX_PES_VIDEO], |
2051 | av7110->pids[DMX_PES_AUDIO], | 2049 | av7110->pids[DMX_PES_AUDIO], |
2052 | av7110->pids[DMX_PES_TELETEXT], 0, | 2050 | av7110->pids[DMX_PES_TELETEXT], 0, |
@@ -2062,6 +2060,9 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status) | |||
2062 | } | 2060 | } |
2063 | } | 2061 | } |
2064 | 2062 | ||
2063 | if (!ret) | ||
2064 | av7110->fe_synced = synced; | ||
2065 | |||
2065 | up(&av7110->pid_mutex); | 2066 | up(&av7110->pid_mutex); |
2066 | return ret; | 2067 | return ret; |
2067 | } | 2068 | } |