Merge ../linux-2.6

1 files changed, 18 insertions, 17 deletions

diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 5a13c4744f61..248fdc7accfb 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -19,7 +19,7 @@
 #include <linux/time.h>
 #include <linux/errno.h>
 #include <linux/jiffies.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 #include "dvb_frontend.h"
 #include "dmxdev.h"
@@ -35,7 +35,6 @@
 #include <linux/dvb/dmx.h>
 #include <linux/pci.h>
 
-
 /*
   TTUSB_HWSECTIONS:
     the DSP supports filtering in hardware, however, since the "muxstream"
@@ -83,8 +82,8 @@ struct ttusb {
         struct dvb_net dvbnet;
 
         /* and one for USB access. */
-        struct semaphore semi2c;
-        struct semaphore semusb;
+        struct mutex semi2c;
+        struct mutex semusb;
 
         struct dvb_adapter adapter;
         struct usb_device *dev;
@@ -150,7 +149,7 @@ static int ttusb_cmd(struct ttusb *ttusb,
         printk("\n");
 #endif
 
-        if (down_interruptible(&ttusb->semusb) < 0)
+        if (mutex_lock_interruptible(&ttusb->semusb) < 0)
                 return -EAGAIN;
 
         err = usb_bulk_msg(ttusb->dev, ttusb->bulk_out_pipe,
@@ -158,13 +157,13 @@ static int ttusb_cmd(struct ttusb *ttusb,
         if (err != 0) {
                 dprintk("%s: usb_bulk_msg(send) failed, err == %i!\n",
                         __FUNCTION__, err);
-                up(&ttusb->semusb);
+                mutex_unlock(&ttusb->semusb);
                 return err;
         }
         if (actual_len != len) {
                 dprintk("%s: only wrote %d of %d bytes\n", __FUNCTION__,
                         actual_len, len);
-                up(&ttusb->semusb);
+                mutex_unlock(&ttusb->semusb);
                 return -1;
         }
 
@@ -174,7 +173,7 @@ static int ttusb_cmd(struct ttusb *ttusb,
         if (err != 0) {
                 printk("%s: failed, receive error %d\n", __FUNCTION__,
                        err);
-                up(&ttusb->semusb);
+                mutex_unlock(&ttusb->semusb);
                 return err;
         }
 #if DEBUG >= 3
@@ -185,14 +184,14 @@ static int ttusb_cmd(struct ttusb *ttusb,
         printk("\n");
 #endif
         if (!needresult)
-                up(&ttusb->semusb);
+                mutex_unlock(&ttusb->semusb);
         return 0;
 }
 
 static int ttusb_result(struct ttusb *ttusb, u8 * data, int len)
 {
         memcpy(data, ttusb->last_result, len);
-        up(&ttusb->semusb);
+        mutex_unlock(&ttusb->semusb);
         return 0;
 }
 
@@ -250,7 +249,7 @@ static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num
         int i = 0;
         int inc;
 
-        if (down_interruptible(&ttusb->semi2c) < 0)
+        if (mutex_lock_interruptible(&ttusb->semi2c) < 0)
                 return -EAGAIN;
 
         while (i < num) {
@@ -284,7 +283,7 @@ static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num
                 i += inc;
         }
 
-        up(&ttusb->semi2c);
+        mutex_unlock(&ttusb->semi2c);
         return i;
 }
 
@@ -689,8 +688,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
                                 memcpy(ttusb->muxpack + ttusb->muxpack_ptr,
                                        data, avail);
                                 ttusb->muxpack_ptr += avail;
-                                if (ttusb->muxpack_ptr > 264)
-                                        BUG();
+                                BUG_ON(ttusb->muxpack_ptr > 264);
                                 data += avail;
                                 len -= avail;
                                 /* determine length */
@@ -1495,8 +1493,11 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         ttusb->dev = udev;
         ttusb->c = 0;
         ttusb->mux_state = 0;
-        sema_init(&ttusb->semi2c, 0);
-        sema_init(&ttusb->semusb, 1);
+        mutex_init(&ttusb->semi2c);
+
+        mutex_lock(&ttusb->semi2c);
+
+        mutex_init(&ttusb->semusb);
 
         ttusb_setup_interfaces(ttusb);
 
@@ -1504,7 +1505,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (ttusb_init_controller(ttusb))
                 printk("ttusb_init_controller: error\n");
 
-        up(&ttusb->semi2c);
+        mutex_unlock(&ttusb->semi2c);
 
         dvb_register_adapter(&ttusb->adapter, "Technotrend/Hauppauge Nova-USB", THIS_MODULE);
         ttusb->adapter.priv = ttusb;