diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-09-13 19:07:48 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-09-13 19:07:48 +0000 |
| commit | d713251b9125c539941b0fb18bb152446880164b (patch) | |
| tree | f2d71b8a2a378bdd97ca4465aedf931d80776cde | |
| parent | 5a388bbceb2a42b71d5d810259ba92a12f02ca8f (diff) | |
| download | mediapointer-dvb-s2-d713251b9125c539941b0fb18bb152446880164b.tar.gz mediapointer-dvb-s2-d713251b9125c539941b0fb18bb152446880164b.tar.bz2 | |
- Small fixes.
* scripts/buildpatch:
- Fixed a problem when commiting <dolar>Id with CVS.
* tuner-core.c: (tuner_command):
- Better debug info for non-implemented iocts.
* tveeprom.c:
- Fixed compiling with gcc2.9x (thanks to Andrew Morton).
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 | ||||
| -rw-r--r-- | v4l/scripts/buildpatch | 2 |
4 files changed, 18 insertions, 6 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index b8351f70f..c386db97d 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.71 2005/09/13 16:25:54 mkrufky Exp $ + * $Id: tuner-core.c,v 1.72 2005/09/13 19:07:48 mchehab Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -706,7 +706,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) break; } default: - tuner_dbg("Unimplemented IOCTL 0x%08x(dir=%d,tp=0x%02x,nr=%d,sz=%d)\n", + tuner_dbg("Unimplemented IOCTL 0x%08x(dir=%d,tp='%c',nr=%d,sz=%d)\n", cmd, _IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd)); break; diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 6cfe69325..741170b18 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -54,14 +54,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define tveeprom_info(fmt, arg...) do {\ printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr , ##arg); } while (0) + c->adapter->nr, c->addr, ## arg); } while (0) #define tveeprom_warn(fmt, arg...) do {\ printk(KERN_WARNING "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr , ##arg); } while (0) + c->adapter->nr, c->addr, ## arg); } while (0) #define tveeprom_dbg(fmt, arg...) do {\ if (debug) \ printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr , ##arg); } while (0) + c->adapter->nr, c->addr, ## arg); } while (0) /* ----------------------------------------------------------------------- */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index e5e3aeff7..a08cfbc3f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-09-13 19:04 mchehab + + * scripts/buildpatch: + - Fixed a problem when commiting <dolar>Id with CVS. + + * tuner-core.c: (tuner_command): + - Better debug info for non-implemented iocts. + * tveeprom.c: + - Fixed compiling with gcc2.9x (thanks to Andrew Morton). + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-09-13 16:22 mkrufky * bttv-cards.c, bttv-driver.c: diff --git a/v4l/scripts/buildpatch b/v4l/scripts/buildpatch index ab091bca0..8404ba471 100644 --- a/v4l/scripts/buildpatch +++ b/v4l/scripts/buildpatch @@ -152,7 +152,7 @@ sub filter_dest ($$) { open OUT, ">$out"; while ($line = <IN>) { - if ($line =~ m/\$Id: buildpatch,v 1.9 2005/09/04 11:45:20 mchehab Exp $/) { + if ($line =~ m/[\$]Id:.*/) { next; } print OUT $line; |