| From 13c06c3a3281180b11de1e9735d1f8c631b867db Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 18 Aug 2019 02:40:14 -0300 |
| Subject: media: saa7146: add cleanup in hexium_attach() |
| |
| From: Wenwen Wang <wenwen@cs.uga.edu> |
| |
| [ 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> |
| --- |
| drivers/media/pci/saa7146/hexium_gemini.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c |
| index dca20a3d98e25..f962269306707 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; |
| } |
| |
| -- |
| 2.20.1 |
| |
