diff --git a/[refs] b/[refs]
index d4df840c4a2b..4370e39d6180 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 861018a6a9b55ca1a5bf8cd0ff2d47944ce88827
+refs/heads/master: 07f640f0ddd72e6158fca7f0694dbaf95cee4d2c
diff --git a/trunk/drivers/media/dvb/bt8xx/dst_ca.c b/trunk/drivers/media/dvb/bt8xx/dst_ca.c
index f6b49a801eba..fee27d58bda9 100644
--- a/trunk/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/trunk/drivers/media/dvb/bt8xx/dst_ca.c
@@ -582,7 +582,7 @@ static int dst_ca_release(struct inode *inode, struct file *file)
 
 static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
 {
-	int bytes_read = 0;
+	ssize_t bytes_read = 0;
 
 	dprintk(verbose, DST_CA_DEBUG, 1, " Device read.");