diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2022-06-15 21:50:30 +0100 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-07-08 16:38:08 +0100 |
| commit | 3bde235bf6780e741d602deb570a8bd7e10a685d (patch) | |
| tree | cae48e46bc94f0d0c5057990229c2962403f0772 | |
| parent | media: atomisp: remove hmm_page_object (diff) | |
media: atomisp: fix __get_frame_info() error handling
On ia_css_pipe_get_info() errors, destroy both the streams as well
as the pipes which were created.
Link: https://lore.kernel.org/linux-media/20220615205037.16549-34-hdegoede@redhat.com
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c index 6e91654ce5da..d03b29add5c3 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c @@ -2653,7 +2653,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd, &p_info); if (ret) { dev_err(isp->dev, "can't get info from pipe\n"); - goto stream_err; + goto get_info_err; } switch (type) { @@ -2684,6 +2684,8 @@ static int __get_frame_info(struct atomisp_sub_device *asd, return 0; +get_info_err: + __destroy_streams(asd, true); stream_err: __destroy_pipes(asd, true); return -EINVAL; |