diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 18:27:32 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 18:27:32 -0200 |
| commit | e39c1e9f2176f254499c771bb7fb56007ec73874 (patch) | |
| tree | e86818243784a34151e119c2057da2cb146437f2 | |
| parent | 0991b38929edc3f7202157c6a1e04682ad9694cc (diff) | |
| parent | 55ea03447517237763baf8378b705f593aeda93f (diff) | |
| download | mediapointer-dvb-s2-e39c1e9f2176f254499c771bb7fb56007ec73874.tar.gz mediapointer-dvb-s2-e39c1e9f2176f254499c771bb7fb56007ec73874.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index c5b238694..d1de5cd59 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1278,7 +1278,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) if (fw_len % sizeof(u32)) { pvr2_trace(PVR2_TRACE_ERROR_LEGS, "size of %s firmware" - " must be a multiple of %u bytes", + " must be a multiple of %zu bytes", fw_files[fwidx],sizeof(u32)); release_firmware(fw_entry); return -1; @@ -3388,7 +3388,9 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw, mutex_lock(&hdw->i2c_list_lock); do { list_for_each(item,&hdw->i2c_clients) { cp = list_entry(item,struct pvr2_i2c_client,list); - if (!v4l2_chip_match_i2c_client(cp->client, req.match_type, req.match_chip)) { + if (!v4l2_chip_match_i2c_client( + cp->client, + req.match_type, req.match_chip)) { continue; } stat = pvr2_i2c_client_cmd( |