aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-06-28 19:53:45 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:23:34 -0400
commit0f2a1ee112a4709a3b1a3c3c64b5d11752da1eef (patch)
treee218133ce44b0d86749bc6d4c24aefcdbce9bb49
parent8f37356b065206316e0b66dbee2718c82329684c (diff)
V4L/DVB (8305): sms1xxx: fix warning: format '%d' expects type 'int', but argument x has type 'size_t'
Fix the following 64bit build warning: make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic' CC [M] smscoreapi.o smscoreapi.c: In function 'smscore_load_firmware_from_file': smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' CC [M] smsusb.o smsusb.c: In function 'smsusb1_load_firmware': smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/siano/smscoreapi.c2
-rw-r--r--drivers/media/dvb/siano/smsusb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 14475c8a7222..c54c7180e39e 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -601,7 +601,7 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
601 sms_info("failed to open \"%s\"", filename); 601 sms_info("failed to open \"%s\"", filename);
602 return rc; 602 return rc;
603 } 603 }
604 sms_info("read FW %s, size=%d", filename, fw->size); 604 sms_info("read FW %s, size=%zd", filename, fw->size);
605 fw_buffer = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT), 605 fw_buffer = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT),
606 GFP_KERNEL | GFP_DMA); 606 GFP_KERNEL | GFP_DMA);
607 if (fw_buffer) { 607 if (fw_buffer) {
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 0f9f5d585e37..b62ca96dfbec 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -209,14 +209,14 @@ static int smsusb1_load_firmware(struct usb_device *udev, int id)
209 rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), 209 rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2),
210 fw_buffer, fw->size, &dummy, 1000); 210 fw_buffer, fw->size, &dummy, 1000);
211 211
212 sms_info("sent %d(%d) bytes, rc %d", fw->size, dummy, rc); 212 sms_info("sent %zd(%d) bytes, rc %d", fw->size, dummy, rc);
213 213
214 kfree(fw_buffer); 214 kfree(fw_buffer);
215 } else { 215 } else {
216 sms_err("failed to allocate firmware buffer"); 216 sms_err("failed to allocate firmware buffer");
217 rc = -ENOMEM; 217 rc = -ENOMEM;
218 } 218 }
219 sms_info("read FW %s, size=%d", smsusb1_fw_lkup[id], fw->size); 219 sms_info("read FW %s, size=%zd", smsusb1_fw_lkup[id], fw->size);
220 220
221 release_firmware(fw); 221 release_firmware(fw);
222 222