diff --git a/[refs] b/[refs]
index c697527c7f9f..9201a0b32dd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8267761881d6bb91c168ba4d629b778cf106c485
+refs/heads/master: 2ce55b606b29c6ab0c8583772f6807b49cc89372
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c
index 198e443e8a5e..8086c62e7545 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-driver.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-driver.c
@@ -1145,6 +1145,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
 	   are not. */
 	itv->tuner_std = itv->std;
 
+	if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
+		ivtv_call_i2c_clients(itv, VIDIOC_INT_S_STD_OUTPUT, &itv->std);
+	}
+
 	retval = ivtv_streams_setup(itv);
 	if (retval) {
 		IVTV_ERR("Error %d setting up streams\n", retval);