From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/5] regmap: regmap_raw_read return error on !bus->read
Date: Thu, 20 Aug 2015 11:12:35 +0200 [thread overview]
Message-ID: <1440061956-29064-5-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1440061956-29064-1-git-send-email-mpa@pengutronix.de>
Return -ENOTSUPP if map->bus->read is not implemented and we do not use
the cache. This code path would directly use bus->read would run into an
NULL pointer for the read function.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/base/regmap/regmap.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index bb4e65e7a950..66efe25d64c9 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2201,6 +2201,11 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass ||
map->cache_type == REGCACHE_NONE) {
+ if (!map->bus->read) {
+ ret = -ENOTSUPP;
+ goto out;
+ }
+
/* Physical block read if there's no cache involved */
ret = _regmap_raw_read(map, reg, val, val_len);
--
2.4.6
next prev parent reply other threads:[~2015-08-20 9:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-20 9:12 [PATCH v2 0/5] regmap: fixes Markus Pargmann
2015-08-20 9:12 ` [PATCH v2 1/5] regmap: Add missing comments about struct regmap_bus Markus Pargmann
2015-08-20 18:20 ` Mark Brown
2015-08-20 9:12 ` [PATCH v2 2/5] regmap: Fix regmap_bulk_write for bus writes Markus Pargmann
2015-08-20 18:27 ` Mark Brown
2015-08-20 9:12 ` [PATCH v2 3/5] regmap: Split use_single_rw internally into use_single_read/write Markus Pargmann
2015-08-20 18:28 ` Mark Brown
2015-08-20 9:12 ` Markus Pargmann [this message]
2015-08-20 18:30 ` [PATCH v2 4/5] regmap: regmap_raw_read return error on !bus->read Mark Brown
2015-08-20 9:12 ` [PATCH v2 5/5] regmap: No multi_write support if bus->write does not exist Markus Pargmann
2015-08-20 18:32 ` Mark Brown
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=1440061956-29064-5-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).