diff --git a/[refs] b/[refs]
index 035dbf7f507f..6960008a8cbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edabaffc7e7fccdeadac6273704102adc2b604ae
+refs/heads/master: 0b915e74ac10b65da930aa430837d4338f5deb65
diff --git a/trunk/drivers/media/dvb/ttpci/av7110_hw.c b/trunk/drivers/media/dvb/ttpci/av7110_hw.c
index c99936c4772a..3a3f5279e927 100644
--- a/trunk/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/trunk/drivers/media/dvb/ttpci/av7110_hw.c
@@ -854,10 +854,8 @@ static osd_raw_window_t bpp2bit[8] = {
 
 static inline int WaitUntilBmpLoaded(struct av7110 *av7110)
 {
-	int ret = wait_event_interruptible_timeout(av7110->bmpq,
+	int ret = wait_event_timeout(av7110->bmpq,
 				av7110->bmp_state != BMP_LOADING, 10*HZ);
-	if (ret == -ERESTARTSYS)
-		return ret;
 	if (ret == 0) {
 		printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n",
 		       ret, av7110->bmp_state);