Johannes Stezenbach schrieb:
>>>I haven't had time to look into it, and still would welcome
>>>patches from others to fix these issues.
hm just saw that I read only half of the original mail(with the warnings).
Here is another patch with some more trivial fixes.
There is one warning left where I don't really know what to do with:
in linux/drivers/media/common/saa7146_hlp.c: (line 559)
u32 base = (u32)vv->ov_fb.base;
with base a pointer to the overlay framebuffer.
Afaik that can't really work :/. But that's a bit above my head how to fix it.
Peter
-------------- next part --------------
Some more trivial fixes.
Signed-off-by: Peter Beutner <p.beutner@xxxxxxx>
Index: linux/drivers/media/dvb/bt8xx/dst_ca.c
===================================================================
--- linux/drivers/media/dvb/bt8xx/dst_ca.c.orig
+++ linux/drivers/media/dvb/bt8xx/dst_ca.c
@@ -580,7 +580,7 @@ static int dst_ca_release(struct inode *
return 0;
}
-static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
{
int bytes_read = 0;
@@ -589,7 +589,7 @@ static int dst_ca_read(struct file *file
return bytes_read;
}
-static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
{
dprintk(verbose, DST_CA_DEBUG, 1, " Device write.");
Index: linux/drivers/media/dvb/cinergyT2/cinergyT2.c
===================================================================
--- linux/drivers/media/dvb/cinergyT2/cinergyT2.c.orig
+++ linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -813,6 +813,8 @@ static int cinergyt2_register_rc(struct
input_register_device(cinergyt2->rc_input_dev);
schedule_delayed_work(&cinergyt2->rc_query_work, HZ/2);
+
+ return 0;
}
static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2)
Index: linux/drivers/media/dvb/frontends/bcm3510.c
===================================================================
--- linux/drivers/media/dvb/frontends/bcm3510.c.orig
+++ linux/drivers/media/dvb/frontends/bcm3510.c
@@ -623,13 +623,13 @@ static int bcm3510_download_firmware(str
err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret);
return ret;
}
- deb_info("got firmware: %d\n",fw->size);
+ deb_info("got firmware: %ld\n",fw->size);
b = fw->data;
for (i = 0; i < fw->size;) {
addr = le16_to_cpu( *( (u16 *)&b[i] ) );
len = le16_to_cpu( *( (u16 *)&b[i+2] ) );
- deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04x\n",addr,len,fw->size);
+ deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04lx\n",addr,len,fw->size);
if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) {
err("firmware download failed: %d\n",ret);
return ret;
Index: linux/drivers/media/dvb/frontends/or51211.c
===================================================================
--- linux/drivers/media/dvb/frontends/or51211.c.orig
+++ linux/drivers/media/dvb/frontends/or51211.c
@@ -112,7 +112,7 @@ static int or51211_load_firmware (struct
u8 tudata[585];
int i;
- dprintk("Firmware is %d bytes\n",fw->size);
+ dprintk("Firmware is %ld bytes\n",fw->size);
/* Get eprom data */
tudata[0] = 17;
