| Message ID | 1346319391-19015-2-git-send-email-remi.cardona@smartjog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/30/2012 11:36 AM, Rémi Cardona wrote: > Since b9bf2eafaad9c1ef02fb3db38c74568be601a43a, the function > ds3000_firmware_ondemand() is called only once during init. This > locking scheme may have been useful when the firmware was loaded at > each tune. > > Furthermore, it looks like this 'lock' was put in to prevent concurrent > access (and not recursion as the comments suggest). However, this open- > coded mechanism is anything but race-free and should have used a proper > mutex. > > Signed-off-by: Rémi Cardona <remi.cardona@smartjog.com> > --- > drivers/media/dvb/frontends/ds3000.c | 9 --------- > 1 file changed, 9 deletions(-) Ping on that patch. Could anyone take a look at it? Many thanks, Rémi -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c index 4c8ac26..066870a 100644 --- a/drivers/media/dvb/frontends/ds3000.c +++ b/drivers/media/dvb/frontends/ds3000.c @@ -233,7 +233,6 @@ struct ds3000_state { struct i2c_adapter *i2c; const struct ds3000_config *config; struct dvb_frontend frontend; - u8 skip_fw_load; /* previous uncorrected block counter for DVB-S2 */ u16 prevUCBS2; }; @@ -395,8 +394,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) if (ds3000_readreg(state, 0xb2) <= 0) return ret; - if (state->skip_fw_load) - return 0; /* Load firmware */ /* request the firmware, this will block until someone uploads it */ printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__, @@ -410,9 +407,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) return ret; } - /* Make sure we don't recurse back through here during loading */ - state->skip_fw_load = 1; - ret = ds3000_load_firmware(fe, fw); if (ret) printk("%s: Writing firmware to device failed\n", __func__); @@ -422,9 +416,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) dprintk("%s: Firmware upload %s\n", __func__, ret == 0 ? "complete" : "failed"); - /* Ensure firmware is always loaded if required */ - state->skip_fw_load = 0; - return ret; }
Since b9bf2eafaad9c1ef02fb3db38c74568be601a43a, the function ds3000_firmware_ondemand() is called only once during init. This locking scheme may have been useful when the firmware was loaded at each tune. Furthermore, it looks like this 'lock' was put in to prevent concurrent access (and not recursion as the comments suggest). However, this open- coded mechanism is anything but race-free and should have used a proper mutex. Signed-off-by: Rémi Cardona <remi.cardona@smartjog.com> --- drivers/media/dvb/frontends/ds3000.c | 9 --------- 1 file changed, 9 deletions(-)