tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] dibusb-common: fix ERROR: do not use assignment in if condition

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Michael Krufky and committed by
Mauro Carvalho Chehab d9abcd74 310df366

+10 -2
+10 -2
drivers/media/dvb/dvb-usb/dibusb-common.c
··· 255 255 msleep(1000); 256 256 } 257 257 258 - if ((adap->fe_adap[0].fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000P_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL || 259 - (adap->fe_adap[0].fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000MC_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL) { 258 + adap->fe_adap[0].fe = dvb_attach(dib3000mc_attach, 259 + &adap->dev->i2c_adap, 260 + DEFAULT_DIB3000P_I2C_ADDRESS, 261 + &mod3000p_dib3000p_config); 262 + if ((adap->fe_adap[0].fe) == NULL) 263 + adap->fe_adap[0].fe = dvb_attach(dib3000mc_attach, 264 + &adap->dev->i2c_adap, 265 + DEFAULT_DIB3000MC_I2C_ADDRESS, 266 + &mod3000p_dib3000p_config); 267 + if ((adap->fe_adap[0].fe) != NULL) { 260 268 if (adap->priv != NULL) { 261 269 struct dibusb_state *st = adap->priv; 262 270 st->ops.pid_parse = dib3000mc_pid_parse;