Merge branch 'fixes' into devel
这个提交包含在:
@@ -854,7 +854,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
|
||||
*/
|
||||
nfamilies = ARRAY_SIZE(mrfld_families),
|
||||
families = devm_kmemdup(&pdev->dev, mrfld_families,
|
||||
nfamilies * sizeof(mrfld_families),
|
||||
sizeof(mrfld_families),
|
||||
GFP_KERNEL);
|
||||
if (!families)
|
||||
return -ENOMEM;
|
||||
|
@@ -1041,17 +1041,9 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
|
||||
struct resource *res;
|
||||
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);
|
||||
if (!drvdata) {
|
||||
dev_err(dev, "failed to allocate memory for driver's "
|
||||
"private data\n");
|
||||
if (!drvdata)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev);
|
||||
if (IS_ERR(ctrl)) {
|
||||
|
在新工单中引用
屏蔽一个用户