The patch number 10894 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
ISA radio drivers: improve kernel log message
It's much nicer if the log message tells you which io ports are possible,
rather than having to run modinfo or look it up in the source or manual.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/radio/radio-aimslab.c | 2 +-
linux/drivers/media/radio/radio-aztech.c | 2 +-
linux/drivers/media/radio/radio-cadet.c | 3 ++-
linux/drivers/media/radio/radio-terratec.c | 2 +-
linux/drivers/media/radio/radio-trust.c | 2 +-
linux/drivers/media/radio/radio-zoltrix.c | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff -r 9bfa3ce24ab0 -r 29bb110cd5ed linux/drivers/media/radio/radio-aimslab.c
--- a/linux/drivers/media/radio/radio-aimslab.c Fri Mar 06 17:55:34 2009 +0100
+++ b/linux/drivers/media/radio/radio-aimslab.c Mon Mar 09 12:11:21 2009 +0100
@@ -399,7 +399,7 @@ static int __init rtrack_init(void)
rt->io = io;
if (rt->io == -1) {
- v4l2_err(v4l2_dev, "you must set an I/O address with
io=0x???\n");
+ v4l2_err(v4l2_dev, "you must set an I/O address with io=0x20f
or 0x30f\n");
return -EINVAL;
}
diff -r 9bfa3ce24ab0 -r 29bb110cd5ed linux/drivers/media/radio/radio-aztech.c
--- a/linux/drivers/media/radio/radio-aztech.c Fri Mar 06 17:55:34 2009 +0100
+++ b/linux/drivers/media/radio/radio-aztech.c Mon Mar 09 12:11:21 2009 +0100
@@ -362,7 +362,7 @@ static int __init aztech_init(void)
az->io = io;
if (az->io == -1) {
- v4l2_err(v4l2_dev, "you must set an I/O address with
io=0x???\n");
+ v4l2_err(v4l2_dev, "you must set an I/O address with io=0x350
or 0x358\n");
return -EINVAL;
}
diff -r 9bfa3ce24ab0 -r 29bb110cd5ed linux/drivers/media/radio/radio-cadet.c
--- a/linux/drivers/media/radio/radio-cadet.c Fri Mar 06 17:55:34 2009 +0100
+++ b/linux/drivers/media/radio/radio-cadet.c Mon Mar 09 12:11:21 2009 +0100
@@ -686,7 +686,8 @@ static int __init cadet_init(void)
/* Else we bail out */
if (dev->io < 0) {
#ifdef MODULE
- v4l2_err(v4l2_dev, "you must set an I/O address with
io=0x???\n");
+ v4l2_err(v4l2_dev, "you must set an I/O address with io=0x330,
0x332, 0x334,\n");
+ v4l2_err(v4l2_dev, "0x336, 0x338, 0x33a, 0x33c or 0x33e\n");
#endif
goto fail;
}
diff -r 9bfa3ce24ab0 -r 29bb110cd5ed linux/drivers/media/radio/radio-terratec.c
--- a/linux/drivers/media/radio/radio-terratec.c Fri Mar 06 17:55:34
2009 +0100
+++ b/linux/drivers/media/radio/radio-terratec.c Mon Mar 09 12:11:21
2009 +0100
@@ -376,7 +376,7 @@ static int __init terratec_init(void)
strlcpy(v4l2_dev->name, "terratec", sizeof(v4l2_dev->name));
tt->io = io;
if (tt->io == -1) {
- v4l2_err(v4l2_dev, "you must set an I/O address with
io=0x???\n");
+ v4l2_err(v4l2_dev, "you must set an I/O address with io=0x590
or 0x591\n");
return -EINVAL;
}
if (!request_region(tt->io, 2, "terratec")) {
diff -r 9bfa3ce24ab0 -r 29bb110cd5ed linux/drivers/media/radio/radio-trust.c
--- a/linux/drivers/media/radio/radio-trust.c Fri Mar 06 17:55:34 2009 +0100
+++ b/linux/drivers/media/radio/radio-trust.c Mon Mar 09 12:11:21 2009 +0100
@@ -384,7 +384,7 @@ static int __init trust_init(void)
mutex_init(&tr->lock);
if (tr->io == -1) {
- v4l2_err(v4l2_dev, "You must set an I/O address with
io=0x???\n");
+ v4l2_err(v4l2_dev, "You must set an I/O address with io=0x0x350
or 0x358\n");
return -EINVAL;
}
if (!request_region(tr->io, 2, "Trust FM Radio")) {
diff -r 9bfa3ce24ab0 -r 29bb110cd5ed linux/drivers/media/radio/radio-zoltrix.c
--- a/linux/drivers/media/radio/radio-zoltrix.c Fri Mar 06 17:55:34 2009 +0100
+++ b/linux/drivers/media/radio/radio-zoltrix.c Mon Mar 09 12:11:21 2009 +0100
@@ -414,7 +414,7 @@ static int __init zoltrix_init(void)
strlcpy(v4l2_dev->name, "zoltrix", sizeof(v4l2_dev->name));
zol->io = io;
if (zol->io == -1) {
- v4l2_err(v4l2_dev, "You must set an I/O address with
io=0x???\n");
+ v4l2_err(v4l2_dev, "You must set an I/O address with io=0x20c
or 0x30c\n");
return -EINVAL;
}
if (zol->io != 0x20c && zol->io != 0x30c) {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/29bb110cd5edec166ec1e55f31e0448e01fd3fdd
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
