|
@@ -735,6 +735,11 @@ static int mxs_saif_probe(struct platform_device *pdev)
|
|
|
else
|
|
|
saif->id = ret;
|
|
|
|
|
|
+ if (saif->id >= ARRAY_SIZE(mxs_saif)) {
|
|
|
+ dev_err(&pdev->dev, "get wrong saif id\n");
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
* If there is no "fsl,saif-master" phandle, it's a saif
|
|
|
* master. Otherwise, it's a slave and its phandle points
|
|
@@ -749,11 +754,11 @@ static int mxs_saif_probe(struct platform_device *pdev)
|
|
|
return ret;
|
|
|
else
|
|
|
saif->master_id = ret;
|
|
|
- }
|
|
|
|
|
|
- if (saif->master_id >= ARRAY_SIZE(mxs_saif)) {
|
|
|
- dev_err(&pdev->dev, "get wrong master id\n");
|
|
|
- return -EINVAL;
|
|
|
+ if (saif->master_id >= ARRAY_SIZE(mxs_saif)) {
|
|
|
+ dev_err(&pdev->dev, "get wrong master id\n");
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
mxs_saif[saif->id] = saif;
|