diff --git a/[refs] b/[refs]
index 853bf758d0c0..71a2ddc2fbf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2be893616c45e4ea4403d1ba501b7ee2f32b0ec
+refs/heads/master: 9b5a4a676a4d6126664c3df5a11f6fe87da63133
diff --git a/trunk/drivers/media/dvb/frontends/cx24123.c b/trunk/drivers/media/dvb/frontends/cx24123.c
index 62d69a6ea699..a356d28fc3bb 100644
--- a/trunk/drivers/media/dvb/frontends/cx24123.c
+++ b/trunk/drivers/media/dvb/frontends/cx24123.c
@@ -553,8 +553,8 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa
 	ndiv = ( ((p->frequency * vco_div * 10) / (2 * XTAL / 1000)) / 32) & 0x1ff;
 	adiv = ( ((p->frequency * vco_div * 10) / (2 * XTAL / 1000)) % 32) & 0x1f;
 
-	if (adiv == 0)
-		ndiv++;
+	if (adiv == 0 && ndiv > 0)
+		ndiv--;
 
 	/* control bits 11, refdiv 11, charge pump polarity 1, charge pump current, ndiv, adiv */
 	state->pllarg = (3 << 19) | (3 << 17) | (1 << 16) | (pump << 14) | (ndiv << 5) | adiv;