提交 8d0a0ac0 编写于 作者: L Linus Walleij

Merge branch 'fixes' into devel

...@@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev) ...@@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
*/ */
nfamilies = ARRAY_SIZE(mrfld_families), nfamilies = ARRAY_SIZE(mrfld_families),
families = devm_kmemdup(&pdev->dev, mrfld_families, families = devm_kmemdup(&pdev->dev, mrfld_families,
nfamilies * sizeof(mrfld_families), sizeof(mrfld_families),
GFP_KERNEL); GFP_KERNEL);
if (!families) if (!families)
return -ENOMEM; return -ENOMEM;
......
...@@ -1041,17 +1041,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) ...@@ -1041,17 +1041,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int ret; int ret;
if (!dev->of_node) {
dev_err(dev, "device tree node not found\n");
return -ENODEV;
}
drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
if (!drvdata) { if (!drvdata)
dev_err(dev, "failed to allocate memory for driver's "
"private data\n");
return -ENOMEM; return -ENOMEM;
}
ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev); ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev);
if (IS_ERR(ctrl)) { if (IS_ERR(ctrl)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册