|
@@ -989,8 +989,8 @@ static int uni_player_parse_dt(struct platform_device *pdev,
|
|
if (!info)
|
|
if (!info)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
- of_property_read_u32(pnode, "version", &player->ver);
|
|
|
|
- if (player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
|
|
|
|
|
|
+ if (of_property_read_u32(pnode, "version", &player->ver) ||
|
|
|
|
+ player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
|
|
dev_err(dev, "Unknown uniperipheral version ");
|
|
dev_err(dev, "Unknown uniperipheral version ");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
@@ -998,10 +998,16 @@ static int uni_player_parse_dt(struct platform_device *pdev,
|
|
if (player->ver >= SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
|
|
if (player->ver >= SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
|
|
info->underflow_enabled = 1;
|
|
info->underflow_enabled = 1;
|
|
|
|
|
|
- of_property_read_u32(pnode, "uniperiph-id", &info->id);
|
|
|
|
|
|
+ if (of_property_read_u32(pnode, "uniperiph-id", &info->id)) {
|
|
|
|
+ dev_err(dev, "uniperipheral id not defined");
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ }
|
|
|
|
|
|
/* Read the device mode property */
|
|
/* Read the device mode property */
|
|
- of_property_read_string(pnode, "mode", &mode);
|
|
|
|
|
|
+ if (of_property_read_string(pnode, "mode", &mode)) {
|
|
|
|
+ dev_err(dev, "uniperipheral mode not defined");
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ }
|
|
|
|
|
|
if (strcasecmp(mode, "hdmi") == 0)
|
|
if (strcasecmp(mode, "hdmi") == 0)
|
|
info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_HDMI;
|
|
info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_HDMI;
|