diff options
| author |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-29 17:38:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:01:35 -0200 |
| commit | 1808a698a87366f9d82945270355c2139df0a16d (patch) | |
| tree | f9842853056a271fac66852a1127e930a25f114d | |
| parent | V4L/DVB (6474): Add support for tuner-xc2028 (diff) | |
V4L/DVB (6475): Fix some troubles at list handling
- priv->count were wrong. Should be incremented since the first usage;
- forgot to use list_del() to remove the driver;
- Release memory if an error occurs during _attach
Thanks to Aidan Thornton <makosoft@googlemail.com> for pointing this.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/tuner-xc2028.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c index 7d53d58aafa1..c5bdeff54288 100644 --- a/drivers/media/video/tuner-xc2028.c +++ b/drivers/media/video/tuner-xc2028.c @@ -639,6 +639,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe) priv->count--; if (!priv->count) { + list_del(&priv->xc2028_list); + if (priv->ctrl.fname) kfree(priv->ctrl.fname); @@ -728,7 +730,6 @@ int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter* i2c_adap, list_for_each_entry(priv, &xc2028_list, xc2028_list) { if (priv->dev == dev) { dev = NULL; - priv->count++; } } @@ -754,6 +755,7 @@ int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter* i2c_adap, list_add_tail(&priv->xc2028_list,&xc2028_list); } + priv->count++; memcpy(&fe->ops.tuner_ops, &xc2028_dvb_tuner_ops, sizeof(xc2028_dvb_tuner_ops)); |