1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c
index da309288daa4..ddd3fc38a419 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -79,7 +79,7 @@ struct std_name {
 #define TSTD_Nc  (V4L2_STD_PAL_Nc)
 #define TSTD_60  (V4L2_STD_PAL_60)
 
-#define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_SECAM)
+#define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_ATSC|CSTD_SECAM)
 
 /* Mapping of standard bits to color system */
 static const struct std_name std_groups[] = {
@@ -328,7 +328,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
         struct v4l2_standard *stddefs;
 
         if (pvrusb2_debug & PVR2_TRACE_STD) {
-                char buf[50];
+                char buf[80];
                 bcnt = pvr2_std_id_to_str(buf,sizeof(buf),id);
                 pvr2_trace(
                         PVR2_TRACE_STD,"Mapping standards mask=0x%x (%.*s)",
@@ -352,8 +352,11 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
                 if ((id & std_mixes[idx2]) == std_mixes[idx2]) std_cnt++;
         }
 
+        /* Don't complain about ATSC standard values */
+        fmsk &= ~CSTD_ATSC;
+
         if (fmsk) {
-                char buf[50];
+                char buf[80];
                 bcnt = pvr2_std_id_to_str(buf,sizeof(buf),fmsk);
                 pvr2_trace(
                         PVR2_TRACE_ERROR_LEGS,