summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-14 13:29:42 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-14 13:29:42 -0300
commit015736e16a8af8a8fe96379031c6a637f4f3a1cb (patch)
tree4a4553e4adfaba823d15794482387264721ee553 /linux/drivers/media/dvb
parent4c6d792a82b4304ed6ccbfccf9f5ed693a3349e2 (diff)
downloadmediapointer-dvb-s2-015736e16a8af8a8fe96379031c6a637f4f3a1cb.tar.gz
mediapointer-dvb-s2-015736e16a8af8a8fe96379031c6a637f4f3a1cb.tar.bz2
backport a few minor cleanups
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/firewire/firedtv-avc.c4
-rw-r--r--linux/drivers/media/dvb/frontends/drx397xD.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/firewire/firedtv-avc.c b/linux/drivers/media/dvb/firewire/firedtv-avc.c
index e95a6f094..620fa2c65 100644
--- a/linux/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/linux/drivers/media/dvb/firewire/firedtv-avc.c
@@ -115,7 +115,7 @@ static const char *debug_fcp_ctype(unsigned int ctype)
}
static const char *debug_fcp_opcode(unsigned int opcode,
- const u8 *data, size_t length)
+ const u8 *data, int length)
{
switch (opcode) {
case AVC_OPCODE_VENDOR: break;
@@ -142,7 +142,7 @@ static const char *debug_fcp_opcode(unsigned int opcode,
return "Vendor";
}
-static void debug_fcp(const u8 *data, size_t length)
+static void debug_fcp(const u8 *data, int length)
{
unsigned int subunit_type, subunit_id, op;
const char *prefix = data[0] > 7 ? "FCP <- " : "FCP -> ";
diff --git a/linux/drivers/media/dvb/frontends/drx397xD.c b/linux/drivers/media/dvb/frontends/drx397xD.c
index 6b3927e8b..0bdb933d0 100644
--- a/linux/drivers/media/dvb/frontends/drx397xD.c
+++ b/linux/drivers/media/dvb/frontends/drx397xD.c
@@ -75,7 +75,7 @@ static struct {
} fw[] = {
#define _FW_ENTRY(a, b, c) { \
.name = a, \
- .file = 0, \
+ .file = NULL, \
.lock = __RW_LOCK_UNLOCKED(fw[c].lock), \
.refcnt = 0, \
.data = { } }