Merge branch 'fixes' into devel

2 files changed, 2 insertions, 10 deletions

diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 7fb765642ee7..7826c7f0cb7c 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -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;
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 513fe6b23248..620727fabe64 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -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)) {