summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/msp3400-driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-07-25 17:39:00 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-07-25 17:39:00 +0000
commit76216b200b94d2dfba09c5c57787cd9a626b3e51 (patch)
treea6de29b9d5aef486c46f77e5f71114748d1035a9 /linux/drivers/media/video/msp3400-driver.c
parent6a4f71143cbf4fb30903020ce12de12cf48c4979 (diff)
downloadmediapointer-dvb-s2-76216b200b94d2dfba09c5c57787cd9a626b3e51.tar.gz
mediapointer-dvb-s2-76216b200b94d2dfba09c5c57787cd9a626b3e51.tar.bz2
* msp3400.c:
- try_to_freeze moved to the right place. * tvaudio.c: - Tvaudio lacks a refrigerator call. This patch fixes that. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Nigel Cunningham <ncunningham@suspend2.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> CVSi- ce.
Diffstat (limited to 'linux/drivers/media/video/msp3400-driver.c')
-rw-r--r--linux/drivers/media/video/msp3400-driver.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 702268d6a..97440f099 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -755,15 +755,16 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
#endif
}
}
- if (current->flags & PF_FREEZE) {
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
+ if (current->flags & PF_FREEZE) {
refrigerator (PF_FREEZE);
-#else
- refrigerator ();
-#endif
}
+#endif
remove_wait_queue(&msp->wq, &wait);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+ try_to_freeze();
+#endif
return msp->restart;
}