diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7d4799a..2fd40e0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1532,7 +1532,7 @@
 		return;
 	}
 
-	pvr2_trace(PVR2_TRACE_EEPROM,
+	pvr2_trace(PVR2_TRACE_ERROR_LEGS,
 		   "Unable to select a viable initial video standard");
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index d3c538cd..b952482 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -46,14 +46,6 @@
 			    PVR2_TRACE_INFO| \
 			    PVR2_TRACE_TOLERANCE| \
 			    PVR2_TRACE_TRAP| \
-			    PVR2_TRACE_FIRMWARE| \
-			    PVR2_TRACE_EEPROM | \
-			    PVR2_TRACE_INIT | \
-			    PVR2_TRACE_I2C | \
-			    PVR2_TRACE_CHIPS | \
-			    PVR2_TRACE_START_STOP | \
-			    PVR2_TRACE_CTL | \
-			    PVR2_TRACE_DEBUGIFC | \
 			    0)
 
 int pvrusb2_debug = DEFAULT_DEBUG_MASK;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 5e8fd86..37dc5d7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -526,7 +526,7 @@
 			cptr = pvr2_hdw_get_ctrl_v4l(hdw,vc->id);
 		}
 		if (!cptr) {
-			pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+			pvr2_trace(PVR2_TRACE_V4LIOCTL,
 				   "QUERYCTRL id=0x%x not implemented here",
 				   vc->id);
 			ret = -EINVAL;
@@ -560,7 +560,7 @@
 			vc->step = 1;
 			break;
 		default:
-			pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+			pvr2_trace(PVR2_TRACE_V4LIOCTL,
 				   "QUERYCTRL id=0x%x name=%s not mappable",
 				   vc->id,pvr2_ctrl_get_name(cptr));
 			ret = -EINVAL;
@@ -678,11 +678,11 @@
 
 	if (ret < 0) {
 		if (pvrusb2_debug & PVR2_TRACE_V4LIOCTL) {
-			pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+			pvr2_trace(PVR2_TRACE_V4LIOCTL,
 				   "pvr2_v4l2_do_ioctl failure, ret=%d",ret);
 		} else {
-			if (pvrusb2_debug & PVR2_TRACE_ERROR_LEGS) {
-				pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+			if (pvrusb2_debug & PVR2_TRACE_V4LIOCTL) {
+				pvr2_trace(PVR2_TRACE_V4LIOCTL,
 					   "pvr2_v4l2_do_ioctl failure, ret=%d"
 					   " command was:",ret);
 				v4l_print_ioctl(pvr2_hdw_get_driver_name(hdw),