From: Michael Krufky Cleanup check for dvb. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/video/cx88/cx88-i2c.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/media/video/cx88/cx88-i2c.c~v4l-dvb-3090-cleanup-check-for-dvb drivers/media/video/cx88/cx88-i2c.c --- devel/drivers/media/video/cx88/cx88-i2c.c~v4l-dvb-3090-cleanup-check-for-dvb 2005-12-09 22:51:00.000000000 -0800 +++ devel-akpm/drivers/media/video/cx88/cx88-i2c.c 2005-12-09 22:51:00.000000000 -0800 @@ -136,10 +136,7 @@ void cx88_call_i2c_clients(struct cx88_c if (0 != core->i2c_rc) return; - if (core->dvbdev == NULL) { - i2c_clients_command(&core->i2c_adap, cmd, arg); - } else { - + if (core->dvbdev) { if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl) core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1); @@ -147,8 +144,8 @@ void cx88_call_i2c_clients(struct cx88_c if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl) core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0); - } - + } else + i2c_clients_command(&core->i2c_adap, cmd, arg); } static struct i2c_algo_bit_data cx8800_i2c_algo_template = { _