wok diff v4l-dvb/stuff/d64b014c5253 @ rev 10914

evince: update bbeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Aug 02 08:40:59 2011 +0200 (2011-08-02)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/v4l-dvb/stuff/d64b014c5253	Tue Aug 02 08:40:59 2011 +0200
     1.3 @@ -0,0 +1,37 @@
     1.4 +
     1.5 +# HG changeset patch
     1.6 +# User Igor M. Liplianin <liplianin@me.by>
     1.7 +# Date 1293902019 -7200
     1.8 +# Node ID d64b014c5253e3699e025339619a6f7704f2fb81
     1.9 +# Parent  d0a2ff731670f853f4e661e8542eacd29fd55131
    1.10 +V4L/DVB: dvb: Convert "mutex" to semaphore
    1.11 +
    1.12 +From: Thomas Gleixner <tglx@linutronix.de>
    1.13 +
    1.14 +Get rid of init_MUTEX[_LOCKED]() and use sema_init() instead.
    1.15 +
    1.16 +Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    1.17 +Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    1.18 +---
    1.19 +
    1.20 +--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c	Fri Dec 31 20:04:34 2010 +0200
    1.21 ++++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c	Sat Jan 01 19:13:39 2011 +0200
    1.22 +@@ -715,7 +715,7 @@
    1.23 + 
    1.24 + 	kthread_stop(fepriv->thread);
    1.25 + 
    1.26 +-	init_MUTEX (&fepriv->sem);
    1.27 ++	sema_init(&fepriv->sem, 1);
    1.28 + 	fepriv->state = FESTATE_IDLE;
    1.29 + 
    1.30 + 	/* paranoia check in case a signal arrived */
    1.31 +@@ -2074,7 +2074,7 @@
    1.32 + 	}
    1.33 + 	fepriv = fe->frontend_priv;
    1.34 + 
    1.35 +-	init_MUTEX (&fepriv->sem);
    1.36 ++	sema_init(&fepriv->sem, 1);
    1.37 + 	init_waitqueue_head (&fepriv->wait_queue);
    1.38 + 	init_waitqueue_head (&fepriv->events.wait_queue);
    1.39 + 	mutex_init(&fepriv->events.mtx);
    1.40 +