diff options
| author | Wenwen Wang <wenwen@cs.uga.edu> | 2019-08-18 02:40:14 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:13:48 +0200 |
| commit | ecc5486763604658933b7679db2e1c5432b28d3c (patch) | |
| tree | 58565951c7ea90abfc19379acaed16703fad636e /drivers | |
| parent | 730e14891202a3858bc7e94df5607165caa6ac6f (diff) | |
| download | linux-stable-ecc5486763604658933b7679db2e1c5432b28d3c.tar.gz linux-stable-ecc5486763604658933b7679db2e1c5432b28d3c.tar.bz2 linux-stable-ecc5486763604658933b7679db2e1c5432b28d3c.zip | |
media: saa7146: add cleanup in hexium_attach()
[ Upstream commit 42e64117d3b4a759013f77bbcf25ab6700e55de7 ]
If saa7146_register_device() fails, no cleanup is executed, leading to
memory/resource leaks. To fix this issue, perform necessary cleanup work
before returning the error.
Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/pci/saa7146/hexium_gemini.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c index dca20a3d98e2..f96226930670 100644 --- a/drivers/media/pci/saa7146/hexium_gemini.c +++ b/drivers/media/pci/saa7146/hexium_gemini.c @@ -292,6 +292,9 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d ret = saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_GRABBER); if (ret < 0) { pr_err("cannot register capture v4l2 device. skipping.\n"); + saa7146_vv_release(dev); + i2c_del_adapter(&hexium->i2c_adapter); + kfree(hexium); return ret; } |