[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

upstream bug fix for ivtv - options



debian-release,

Upstream have released a bug fix patch for ivtv (attached), which takes the 
package from patch level 1 to 2. (0.8.2)

This fixes handling of corrupt tveeprom and a busy waiting loop.

This issues haven't been reported by debian users (yet)

Shall I:

1.	Backport the patch to 0.8.1 and submit for inclusion in etch,
2.	Create the new upstream release (0.8.2) and submit to unstable and not seek 
inclusion in etch, 
3.	Create the new upstream release (0.8.2) and submit to experimental, or
4.	Wait until etch is released and then submit to unstable

The diff is pretty small.

Mark
diff -ur ivtv-0.8.1/ChangeLog ivtv-0.8.2/ChangeLog
--- ivtv-0.8.1/ChangeLog	2006-11-19 22:33:55.000000000 +0000
+++ ivtv-0.8.2/ChangeLog	2006-12-10 17:36:48.000000000 +0000
@@ -1,5 +1,9 @@
 IVTV changes:
 
+0.8.2 stable release
+	- Fix handling of corrupt tveeprom.
+	- Fix busy wait loop
+
 0.8.1 stable release
 	- vbi test tool accepts -d1 as a shortcut for /dev/video1
 	- added videodev2.h in utils since distros often are sloppy
diff -ur ivtv-0.8.1/driver/ivtv-driver.c ivtv-0.8.2/driver/ivtv-driver.c
--- ivtv-0.8.1/driver/ivtv-driver.c	2006-11-19 12:23:34.000000000 +0000
+++ ivtv-0.8.2/driver/ivtv-driver.c	2006-11-25 21:20:43.000000000 +0000
@@ -414,6 +414,9 @@
                 case 26000 ... 26999:  /* Regular PVR150 */
 			itv->card = ivtv_get_card(IVTV_CARD_PVR_150);
 			break;
+		case 0:
+			IVTV_ERR("Invalid EEPROM\n");
+			return;
 		default:
 			IVTV_ERR("Unknown model %d, defaulting to PVR-150\n", tv.model);
 			itv->card = ivtv_get_card(IVTV_CARD_PVR_150);
diff -ur ivtv-0.8.1/driver/ivtv-queue.c ivtv-0.8.2/driver/ivtv-queue.c
--- ivtv-0.8.1/driver/ivtv-queue.c	2006-11-19 12:07:58.000000000 +0000
+++ ivtv-0.8.2/driver/ivtv-queue.c	2006-12-03 09:34:34.000000000 +0000
@@ -891,7 +891,7 @@
 			break;
 		}
 
-		//ivtv_sleep_timeout(HZ / 100, 1);
+		ivtv_sleep_timeout(HZ / 100, 1);
 		if ((jiffies - then) > (HZ /5)) {
 			IVTV_DEBUG_WARN(
 				   "DMA_TO: REG_DMAXFER 2 wait failed\n");
diff -ur ivtv-0.8.1/driver/ivtv-version.h ivtv-0.8.2/driver/ivtv-version.h
--- ivtv-0.8.1/driver/ivtv-version.h	2006-09-25 10:39:55.000000000 +0100
+++ ivtv-0.8.2/driver/ivtv-version.h	2006-11-19 22:35:36.000000000 +0000
@@ -23,7 +23,7 @@
 #define IVTV_DRIVER_NAME "ivtv"
 #define IVTV_DRIVER_VERSION_MAJOR 0
 #define IVTV_DRIVER_VERSION_MINOR 8
-#define IVTV_DRIVER_VERSION_PATCHLEVEL 1
+#define IVTV_DRIVER_VERSION_PATCHLEVEL 2
 
 #define IVTV_VERSION __stringify(IVTV_DRIVER_VERSION_MAJOR) "." __stringify(IVTV_DRIVER_VERSION_MINOR) "." __stringify(IVTV_DRIVER_VERSION_PATCHLEVEL) " " IVTV_DRIVER_VERSION_COMMENT
 #define IVTV_DRIVER_VERSION KERNEL_VERSION(IVTV_DRIVER_VERSION_MAJOR,IVTV_DRIVER_VERSION_MINOR,IVTV_DRIVER_VERSION_PATCHLEVEL)

Attachment: pgp8jO5mD8Z0z.pgp
Description: PGP signature


Reply to: