summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/firewire/firedtv-avc.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 04:48:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 04:48:11 -0300
commite1feeb2f6e1f46de3a06565b23587ce5a1b3c79b (patch)
treef6583d946ed918be82211997e9259268d577c03a /linux/drivers/media/dvb/firewire/firedtv-avc.c
parent24633f3642291c4afb7f6839f0d7e2c1ea7c2be1 (diff)
parent169802c05f1d866f908365460b89269bf1d48247 (diff)
downloadmediapointer-dvb-s2-e1feeb2f6e1f46de3a06565b23587ce5a1b3c79b.tar.gz
mediapointer-dvb-s2-e1feeb2f6e1f46de3a06565b23587ce5a1b3c79b.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/firewire/firedtv-avc.c')
-rw-r--r--linux/drivers/media/dvb/firewire/firedtv-avc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/firewire/firedtv-avc.c b/linux/drivers/media/dvb/firewire/firedtv-avc.c
index b55d9ccaf..d8dae2599 100644
--- a/linux/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/linux/drivers/media/dvb/firewire/firedtv-avc.c
@@ -150,15 +150,20 @@ static void debug_fcp(const u8 *data, size_t length)
subunit_type = data[1] >> 3;
subunit_id = data[1] & 7;
op = subunit_type == 0x1e || subunit_id == 5 ? ~0 : data[2];
- printk(KERN_INFO "%ssu=%x.%x l=%d: %-8s - %s\n",
+ printk(KERN_INFO "%ssu=%x.%x l=%zu: %-8s - %s\n",
prefix, subunit_type, subunit_id, length,
debug_fcp_ctype(data[0]),
debug_fcp_opcode(op, data, length));
}
if (avc_debug & AVC_DEBUG_FCP_PAYLOADS)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)
print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, 16, 1,
data, length, false);
+#else
+ print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, 16, 1,
+ (void *)data, length, false);
+#endif
}
static int __avc_write(struct firedtv *fdtv,