summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c6
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 5b68bad01..b6ee5b112 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -198,7 +198,7 @@ static int pvr2_encoder_cmd(void *ctxt,
" - too many input arguments"
" (was given %u limit %u)",
arg_cnt_send,
- (sizeof(wrData)/sizeof(wrData[0])) - 4);
+ (unsigned int)(sizeof(wrData)/sizeof(wrData[0])) - 4);
return -EINVAL;
}
@@ -209,7 +209,7 @@ static int pvr2_encoder_cmd(void *ctxt,
" - too many return arguments"
" (was given %u limit %u)",
arg_cnt_recv,
- (sizeof(rdData)/sizeof(rdData[0])) - 4);
+ (unsigned int)(sizeof(rdData)/sizeof(rdData[0])) - 4);
return -EINVAL;
}
@@ -308,7 +308,7 @@ static int pvr2_encoder_vcmd(struct pvr2_hdw *hdw, int cmd,
"Failed to write cx23416 command"
" - too many arguments"
" (was given %u limit %u)",
- args,sizeof(data)/sizeof(data[0]));
+ args,(unsigned int)(sizeof(data)/sizeof(data[0])));
return -EINVAL;
}
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 01d8d8f4a..e1ac2c386 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -22,6 +22,7 @@
#include "compat.h"
#include <linux/kernel.h>
+#include <linux/version.h>
#include "pvrusb2-context.h"
#include "pvrusb2-hdw.h"
#include "pvrusb2.h"