[DVB patch 0/3] a few DVB bug fixes

[DVB patch 0/3] a few DVB bug fixes

[Johannes Stezenbach]

Hi Andrew,

here are a few small DVB bug fixes. Please apply.

Thanks,
Johannes

[DVB patch 1/3] usb: fix some typos

[Johannes Stezenbach]

[-- Attachment #1: dvb-usb-fix-typos.patch --]
[-- Type: text/plain, Size: 3334 bytes --]

From: Patrick Boettcher <pb@linuxtv.org>
corrected some typos.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>

 drivers/media/dvb/dvb-usb/dvb-usb-dvb.c  |    2 +-
 drivers/media/dvb/dvb-usb/dvb-usb-init.c |    6 +++---
 drivers/media/dvb/dvb-usb/vp7045.c       |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c	2005-07-12 02:47:58.000000000 +0200
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c	2005-07-12 02:52:49.000000000 +0200
@@ -175,7 +175,7 @@ static int dvb_usb_fe_sleep(struct dvb_f
 int dvb_usb_fe_init(struct dvb_usb_device* d)
 {
 	if (d->props.frontend_attach == NULL) {
-		err("strange '%s' don't want to attach a frontend.",d->desc->name);
+		err("strange '%s' doesn't want to attach a frontend.",d->desc->name);
 		return 0;
 	}
 
Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-usb/dvb-usb-init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/dvb-usb/dvb-usb-init.c	2005-07-11 21:29:46.000000000 +0200
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-usb/dvb-usb-init.c	2005-07-12 02:52:49.000000000 +0200
@@ -51,17 +51,17 @@ static int dvb_usb_init(struct dvb_usb_d
 
 /* speed - when running at FULL speed we need a HW PID filter */
 	if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {
-		err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a HW PID filter)");
+		err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
 		return -ENODEV;
 	}
 
 	if ((d->udev->speed == USB_SPEED_FULL && d->props.caps & DVB_USB_HAS_PID_FILTER) ||
 		(d->props.caps & DVB_USB_NEED_PID_FILTERING)) {
-		info("will use the device's hw PID filter.");
+		info("will use the device's hardware PID filter (table count: %d).",d->props.pid_filter_count);
 		d->pid_filtering = 1;
 		d->max_feed_count = d->props.pid_filter_count;
 	} else {
-		info("will pass the complete MPEG2 transport stream to the demuxer.");
+		info("will pass the complete MPEG2 transport stream to the software demuxer.");
 		d->pid_filtering = 0;
 		d->max_feed_count = 255;
 	}
Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-usb/vp7045.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/dvb-usb/vp7045.c	2005-07-11 21:29:46.000000000 +0200
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/dvb-usb/vp7045.c	2005-07-12 02:52:49.000000000 +0200
@@ -128,7 +128,7 @@ static struct dvb_usb_rc_key vp7045_rc_k
 	{ 0x00, 0x0f, KEY_TEXT } /* Teletext */
 };
 
-static int vp7045_rc_query(struct dvb_usb_device *d, u32 *key_buf, int *state)
+static int vp7045_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
 	u8 key;
 	int i;
@@ -144,7 +144,7 @@ static int vp7045_rc_query(struct dvb_us
 	for (i = 0; i < sizeof(vp7045_rc_keys)/sizeof(struct dvb_usb_rc_key); i++)
 		if (vp7045_rc_keys[i].data == key) {
 			*state = REMOTE_KEY_PRESSED;
-			*key_buf = vp7045_rc_keys[i].event;
+			*event = vp7045_rc_keys[i].event;
 			break;
 		}
 	return 0;

--

[DVB patch 2/3] fix kobject names (no slashes)

[Johannes Stezenbach]

[-- Attachment #1: dvb-kobject-name-fix.patch --]
[-- Type: text/plain, Size: 1806 bytes --]

From: Julian Scheel <julian@jusst.de>

The / in the driver name (budget dvb /w video in) is not a valid character for
device names - removed it, now it works!

Same for ttusb-budget.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Julian Scheel <julian@jusst.de>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>

 drivers/media/dvb/ttpci/budget-av.c               |    2 +-
 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/ttpci/budget-av.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/ttpci/budget-av.c	2005-07-11 21:29:46.000000000 +0200
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/ttpci/budget-av.c	2005-07-12 02:53:19.000000000 +0200
@@ -1022,7 +1022,7 @@ static struct pci_device_id pci_tbl[] = 
 MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
-	.name = "budget dvb /w video in\0",
+	.name = "budget_av",
 	.pci_tbl = pci_tbl,
 
 	.module = THIS_MODULE,
Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2005-07-11 21:29:47.000000000 +0200
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2005-07-12 02:53:19.000000000 +0200
@@ -1626,7 +1626,7 @@ static struct usb_device_id ttusb_table[
 MODULE_DEVICE_TABLE(usb, ttusb_table);
 
 static struct usb_driver ttusb_driver = {
-      .name		= "Technotrend/Hauppauge USB-Nova",
+      .name		= "ttusb",
       .probe		= ttusb_probe,
       .disconnect	= ttusb_disconnect,
       .id_table		= ttusb_table,

--

[DVB patch 3/3] dst: printk -> dprintk

[Johannes Stezenbach]

[-- Attachment #1: dvb-twinhan-dst-printk-fix.patch --]
[-- Type: text/plain, Size: 1015 bytes --]

From: Johannes Stezenbach <js@linuxtv.org>
- stop log spamming when running femon (printk -> dprintk)

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>

 drivers/media/dvb/bt8xx/dst.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.13-rc2-mm1/drivers/media/dvb/bt8xx/dst.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/drivers/media/dvb/bt8xx/dst.c	2005-07-11 21:29:46.000000000 +0200
+++ linux-2.6.13-rc2-mm1/drivers/media/dvb/bt8xx/dst.c	2005-07-12 02:53:21.000000000 +0200
@@ -928,7 +928,7 @@ static int dst_get_signal(struct dst_sta
 {
 	int retval;
 	u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb };
-	printk("%s: Getting Signal strength and other parameters !!!!!!!!\n", __FUNCTION__);
+	dprintk("%s: Getting Signal strength and other parameters\n", __FUNCTION__);
 	if ((state->diseq_flags & ATTEMPT_TUNE) == 0) {
 		state->decode_lock = state->decode_strength = state->decode_snr = 0;
 		return 0;

--