From: Oliver Endriss <[email protected]>
av7110_fe_lock_fix() modified in a way that it can be retried after -ERESTARTSYS
Signed-off-by: Oliver Endriss <[email protected]>
Signed-off-by: Johannes Stezenbach <[email protected]>
drivers/media/dvb/ttpci/av7110.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
Index: linux-2.6.12-git8/drivers/media/dvb/ttpci/av7110.c
===================================================================
--- linux-2.6.12-git8.orig/drivers/media/dvb/ttpci/av7110.c 2005-06-27 13:24:23.000000000 +0200
+++ linux-2.6.12-git8/drivers/media/dvb/ttpci/av7110.c 2005-06-27 13:24:24.000000000 +0200
@@ -2038,15 +2038,13 @@ static int av7110_fe_lock_fix(struct av7
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,
@@ -2062,6 +2060,9 @@ static int av7110_fe_lock_fix(struct av7
}
}
+ if (!ret)
+ av7110->fe_synced = synced;
+
up(&av7110->pid_mutex);
return ret;
}
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]