From: Márton Németh <nm127@freemail.hu>
Date: Sun, 22 Nov 2009 21:52:37 +0000 (-0300)
Subject: V4L/DVB (13589): dib8000: merge two conditionals
X-Git-Tag: firefly_0821_release~9833^2~3650^2~76
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e8fdbd023ef6a05da444baacfea75fdf97bdc50;p=firefly-linux-kernel-4.4.55.git

V4L/DVB (13589): dib8000: merge two conditionals

Merge two ifs: the condition is the same. The second if
uses the ncoeff which is initialized in the first if.

Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
index bb2ec1567cd6..335c6c03003c 100644
--- a/drivers/media/dvb/frontends/dib8000.c
+++ b/drivers/media/dvb/frontends/dib8000.c
@@ -1423,10 +1423,9 @@ static void dib8000_set_channel(struct dib8000_state *state, u8 seq, u8 autosear
 			}
 			break;
 		}
-	}
-	if (state->fe.dtv_property_cache.isdbt_sb_mode == 1)
 		for (i = 0; i < 8; i++)
 			dib8000_write_word(state, 343 + i, ncoeff[i]);
+	}
 
 	// P_small_coef_ext_enable=ISDB-Tsb, P_small_narrow_band=ISDB-Tsb, P_small_last_seg=13, P_small_offset_num_car=5
 	dib8000_write_word(state, 351,