diff options
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/lgdt3302.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index b9d596883..246f7c7d6 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c @@ -800,9 +800,10 @@ EXPORT_SYMBOL(dvb_ca_en50221_camchange_irq); */ static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot) { - dprintk("%s\n", __FUNCTION__); unsigned long irqsave; + dprintk("%s\n", __FUNCTION__); + write_lock_irqsave(&ca->slot_info[slot].lock, irqsave); ca->pub->slot_shutdown(ca->pub, slot); ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE; diff --git a/linux/drivers/media/dvb/frontends/lgdt3302.c b/linux/drivers/media/dvb/frontends/lgdt3302.c index c3b8d4e08..b153da47c 100644 --- a/linux/drivers/media/dvb/frontends/lgdt3302.c +++ b/linux/drivers/media/dvb/frontends/lgdt3302.c @@ -291,13 +291,11 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe, /* Change only if we are actually changing the channel */ if (state->current_frequency != param->frequency) { u8 buf[5]; + struct i2c_msg msg = { .flags = 0, .buf = &buf[1], .len = 4 }; + int err; - /* This must be done before the initialized msg is declared */ state->config->pll_set(fe, param, buf); - - struct i2c_msg msg = - { .addr = buf[0], .flags = 0, .buf = &buf[1], .len = 4 }; - int err; + msg.addr = buf[0]; dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x " "0x%02x 0x%02x\n", __FUNCTION__, |