Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
index 39802c0539b6..3d34fc4ca826 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
@@ -266,9 +266,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
                 if (!ret)
                         ret = atmel_hlcdc_check_endpoint(dev, &ep);
 
-                of_node_put(ep_np);
-                if (ret)
+                if (ret) {
+                        of_node_put(ep_np);
                         return ret;
+                }
         }
 
         for_each_endpoint_of_node(dev->dev->of_node, ep_np) {
@@ -276,9 +277,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
                 if (!ret)
                         ret = atmel_hlcdc_attach_endpoint(dev, &ep);
 
-                of_node_put(ep_np);
-                if (ret)
+                if (ret) {
+                        of_node_put(ep_np);
                         return ret;
+                }
         }
 
         return 0;
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index aef3ca8a81fa..016c191221f3 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -339,6 +339,8 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane,
 
                 atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff,
                                              factor_reg);
+        } else {
+                atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, 0);
         }
 }