staging: media: atomisp: improve unwinding

This fixes two smatch warnings:

drivers/staging/media/atomisp/pci/atomisp_cmd.c:2779 atomisp_cp_dvs_6axis_config() warn: missing unwind goto?
drivers/staging/media/atomisp/pci/atomisp_cmd.c:2878 atomisp_cp_morph_table() warn: missing unwind goto?

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
CC: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index a54be2d20c5872637c663fce18ef52e4a875cfaf..759233a7ba5053cf3ed8da1cdebcc94980a86fbf 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -2771,12 +2771,16 @@ int atomisp_cp_dvs_6axis_config(struct atomisp_sub_device *asd,
                        css_param->dvs_6axis = NULL;
 
                        dvs_6axis_config = ia_css_dvs2_6axis_config_allocate(stream);
-                       if (!dvs_6axis_config)
-                               return -ENOMEM;
+                       if (!dvs_6axis_config) {
+                               ret = -ENOMEM;
+                               goto error;
+                       }
                } else if (!dvs_6axis_config) {
                        dvs_6axis_config = ia_css_dvs2_6axis_config_allocate(stream);
-                       if (!dvs_6axis_config)
-                               return -ENOMEM;
+                       if (!dvs_6axis_config) {
+                               ret = -ENOMEM;
+                               goto error;
+                       }
                }
 
                dvs_6axis_config->exp_id = source_6axis_config->exp_id;
@@ -2874,8 +2878,10 @@ int atomisp_cp_morph_table(struct atomisp_sub_device *asd,
                morph_table = atomisp_css_morph_table_allocate(
                                source_morph_table->width,
                                source_morph_table->height);
-               if (!morph_table)
-                       return -ENOMEM;
+               if (!morph_table) {
+                       ret = -ENOMEM;
+                       goto error;
+               }
 
                for (i = 0; i < IA_CSS_MORPH_TABLE_NUM_PLANES; i++) {
                        if (copy_from_compatible(morph_table->coordinates_x[i],