2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 71bb04ab91d7..2f4909a32540 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -722,6 +722,12 @@ static int __devinit cx18_probe(struct pci_dev *dev,
         /* if no tuner was found, then pick the first tuner in the card list */
         if (cx->options.tuner == -1 && cx->card->tuners[0].std) {
                 cx->std = cx->card->tuners[0].std;
+                if (cx->std & V4L2_STD_PAL)
+                        cx->std = V4L2_STD_PAL_BG | V4L2_STD_PAL_H;
+                else if (cx->std & V4L2_STD_NTSC)
+                        cx->std = V4L2_STD_NTSC_M;
+                else if (cx->std & V4L2_STD_SECAM)
+                        cx->std = V4L2_STD_SECAM_L;
                 cx->options.tuner = cx->card->tuners[0].tuner;
         }
         if (cx->options.radio == -1)
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 9e6a64903875..41fd79279bb5 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1128,6 +1128,12 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
         /* if no tuner was found, then pick the first tuner in the card list */
         if (itv->options.tuner == -1 && itv->card->tuners[0].std) {
                 itv->std = itv->card->tuners[0].std;
+                if (itv->std & V4L2_STD_PAL)
+                        itv->std = V4L2_STD_PAL_BG | V4L2_STD_PAL_H;
+                else if (itv->std & V4L2_STD_NTSC)
+                        itv->std = V4L2_STD_NTSC_M;
+                else if (itv->std & V4L2_STD_SECAM)
+                        itv->std = V4L2_STD_SECAM_L;
                 itv->options.tuner = itv->card->tuners[0].tuner;
         }
         if (itv->options.radio == -1)