mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 13:11:40 +00:00
V4L/DVB (5743): Tuner: clean up kfree() after release
Although it is safe to kfree(NULL), We only need to kfree(priv) if the release callback is undefined. As it stands now, there is some redundancy in the operation of releasing the priv data structures. This patch will call kfree(priv) and set priv to NULL, if the release callback isnt defined. Otherwise, let the release callback handle this itself. Thanks to Mauro Carvalho Chehab for suggesting this. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
024cf53089
commit
052c50d916
@ -180,8 +180,10 @@ static void set_type(struct i2c_client *c, unsigned int type,
|
||||
/* discard private data, in case set_type() was previously called */
|
||||
if (t->release)
|
||||
t->release(c);
|
||||
kfree(t->priv);
|
||||
t->priv = NULL;
|
||||
else {
|
||||
kfree(t->priv);
|
||||
t->priv = NULL;
|
||||
}
|
||||
|
||||
switch (t->type) {
|
||||
case TUNER_MT2032:
|
||||
@ -566,7 +568,9 @@ static int tuner_detach(struct i2c_client *client)
|
||||
|
||||
if (t->release)
|
||||
t->release(client);
|
||||
kfree(t->priv);
|
||||
else {
|
||||
kfree(t->priv);
|
||||
}
|
||||
kfree(t);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user