1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 48da36a15fca..6e0ac4c5c379 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -1235,8 +1235,14 @@ zoran_setup_videocodec (struct zoran *zr,
                 return m;
         }
 
-        m->magic = 0L; /* magic not used */
-        m->type = VID_HARDWARE_ZR36067;
+        /* magic and type are unused for master struct. Makes sense only at
+           codec structs.
+           In the past, .type were initialized to the old V4L1 .hardware
+           value, as VID_HARDWARE_ZR36067
+         */
+        m->magic = 0L;
+        m->type = 0;
+
         m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER;
         strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name));
         m->data = zr;