summaryrefslogtreecommitdiff
path: root/v4l_experimental/pvrusb2/pvrusb2-hdw.c
diff options
context:
space:
mode:
authorMike Isely <devnull@localhost>2006-01-23 06:58:06 +0000
committerMike Isely <devnull@localhost>2006-01-23 06:58:06 +0000
commit02770b94ef98488e5f3a2f255ab32bcf6829710d (patch)
treee0bc4d8d28cdf841a01d6abbe8b020c392234d7d /v4l_experimental/pvrusb2/pvrusb2-hdw.c
parent5a0c9ba6e3b1171b5998d194fd5d7d9142f45881 (diff)
downloadmediapointer-dvb-s2-02770b94ef98488e5f3a2f255ab32bcf6829710d.tar.gz
mediapointer-dvb-s2-02770b94ef98488e5f3a2f255ab32bcf6829710d.tar.bz2
Use mutexes in pvrusb2 for kernel 2.6.16 or later
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l_experimental/pvrusb2/pvrusb2-hdw.c')
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-hdw.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw.c b/v4l_experimental/pvrusb2/pvrusb2-hdw.c
index c7b169d0f..20206cff9 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-hdw.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-hdw.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-hdw.c,v 1.12 2006/01/14 21:11:17 mcisely Exp $
+ * $Id: pvrusb2-hdw.c,v 1.13 2006/01/23 06:58:06 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
*
@@ -1165,9 +1165,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf)
ifnum = hdw->usb_intf->cur_altsetting->desc.bInterfaceNumber;
usb_set_interface(hdw->usb_dev,ifnum,0);
- init_MUTEX(&hdw->ctl_lock_sem);
- init_MUTEX(&hdw->big_lock_sem);
-
+ mutex_init(&hdw->ctl_lock_mutex);
+ mutex_init(&hdw->big_lock_mutex);
return hdw;
fail: