summaryrefslogtreecommitdiffstats
path: root/sound/soc/sti/uniperif_reader.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-09-25 08:33:11 +0200
committerTakashi Iwai <tiwai@suse.de>2015-09-25 08:33:11 +0200
commit0b2c8c12f92996debdd7a2c2aebb33242e30922a (patch)
tree1bd21fb439e7a7493ffd8fb05d548d68e9f64980 /sound/soc/sti/uniperif_reader.c
parentdb25f440f42eca380fcdb339f51cf73633e32485 (diff)
parent4922e7a1b767fcf6f29ce121ad74e424f4045eff (diff)
downloadop-kernel-dev-0b2c8c12f92996debdd7a2c2aebb33242e30922a.zip
op-kernel-dev-0b2c8c12f92996debdd7a2c2aebb33242e30922a.tar.gz
Merge tag 'asoc-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.4 A first batch of updates targetted at v4.4. There are no substantial core fixes here, the biggest block of changes is updates to the rcar drivers and the addition of a CODEC driver for the AK4613.
Diffstat (limited to 'sound/soc/sti/uniperif_reader.c')
-rw-r--r--sound/soc/sti/uniperif_reader.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c
index c502626..f791239 100644
--- a/sound/soc/sti/uniperif_reader.c
+++ b/sound/soc/sti/uniperif_reader.c
@@ -316,7 +316,11 @@ static int uni_reader_parse_dt(struct platform_device *pdev,
if (!info)
return -ENOMEM;
- of_property_read_u32(node, "version", &reader->ver);
+ if (of_property_read_u32(node, "version", &reader->ver) ||
+ reader->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
+ dev_err(&pdev->dev, "Unknown uniperipheral version ");
+ return -EINVAL;
+ }
/* Save the info structure */
reader->info = info;
OpenPOWER on IntegriCloud