From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
jacopo@jmondi.org, niklas.soderlund@ragnatech.se
Subject: [PATCH v4 6/8] ipu3-cio2: Clean up notifier's subdev list if parsing endpoints fails
Date: Fri, 28 Jun 2019 15:00:52 +0300 [thread overview]
Message-ID: <20190628120054.11818-7-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190628120054.11818-1-sakari.ailus@linux.intel.com>
The notifier must be cleaned up whenever parsing endpoints fails. Do that
to avoid a memory leak in that case.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/pci/intel/ipu3/ipu3-cio2.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index c1d133e17e4b..373970f812f4 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1504,7 +1504,7 @@ static int cio2_notifier_init(struct cio2_device *cio2)
sizeof(struct sensor_async_subdev),
cio2_fwnode_parse);
if (ret < 0)
- return ret;
+ goto out;
if (list_empty(&cio2->notifier.asd_list))
return -ENODEV; /* no endpoint */
@@ -1514,9 +1514,13 @@ static int cio2_notifier_init(struct cio2_device *cio2)
if (ret) {
dev_err(&cio2->pci_dev->dev,
"failed to register async notifier : %d\n", ret);
- v4l2_async_notifier_cleanup(&cio2->notifier);
+ goto out;
}
+out:
+ if (ret)
+ v4l2_async_notifier_cleanup(&cio2->notifier);
+
return ret;
}
--
2.11.0
next prev parent reply other threads:[~2019-06-28 12:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 12:00 [PATCH v4 0/8] Rework V4L2 fwnode parsing; add defaults and avoid iteration Sakari Ailus
2019-06-28 12:00 ` [PATCH v4 1/8] davinci-vpif: Don't dereference endpoint after putting it, fix refcounting Sakari Ailus
2019-06-28 12:00 ` [PATCH v4 2/8] v4l2-async: Get fwnode reference when putting it to the notifier's list Sakari Ailus
2019-06-28 12:00 ` [PATCH v4 3/8] v4l2-async: Add v4l2_async_notifier_add_fwnode_remote_subdev Sakari Ailus
2019-06-28 12:00 ` [PATCH v4 4/8] omap3isp: Rework OF endpoint parsing Sakari Ailus
2019-06-28 12:00 ` [PATCH v4 5/8] v4l2-async: Safely clean up an uninitialised notifier Sakari Ailus
2019-06-28 12:00 ` Sakari Ailus [this message]
2019-06-28 12:00 ` [PATCH v4 7/8] ipu3-cio2: Proceed with notifier init even if there are no subdevs Sakari Ailus
2019-06-28 12:00 ` [PATCH v4 8/8] ipu3-cio2: Parse information from firmware without using callbacks Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190628120054.11818-7-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=hverkuil@xs4all.nl \
--cc=jacopo@jmondi.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).