diff --git a/[refs] b/[refs]
index 02dd0d07bf7d..289223538bd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7daa88f23bb23f61977063e3f8ea9598e65e32
+refs/heads/master: 4bfae52b69360a966f41ba3308e57a6df41ff8e1
diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c
index 7acc175d805a..fd248a19c259 100644
--- a/trunk/drivers/media/video/tuner-xc2028.c
+++ b/trunk/drivers/media/video/tuner-xc2028.c
@@ -970,7 +970,10 @@ static int xc2028_set_params(struct dvb_frontend *fe,
 		break;
 	case FE_ATSC:
 		bw = BANDWIDTH_6_MHZ;
+		/* The only ATSC firmware (at least on v2.7) is D2633,
+		   so overrides ctrl->d2633 */
 		type |= ATSC| D2633;
+		type &= ~D2620;
 		break;
 	/* DVB-S is not supported */
 	default: