[kernel] r22854 - dists/jessie/linux/debian/patches/features/all

[Uwe Kleine-König]

Author: ukleinek-guest
Date: Fri Jul 24 21:53:57 2015
New Revision: 22854

Log:
fix fuzz for update to 3.16.7-ckt15

Modified:
   dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch

Modified: dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch
==============================================================================
--- dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch	Fri Jul 24 21:13:52 2015	(r22853)
+++ dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch	Fri Jul 24 21:53:57 2015	(r22854)
@@ -21,10 +21,9 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/of/base.c b/drivers/of/base.c
-index 7af64c4..293ed4b 100644
 --- a/drivers/of/base.c
 +++ b/drivers/of/base.c
-@@ -1859,6 +1859,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
+@@ -2027,6 +2027,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
  {
  	struct property *pp;
  
@@ -32,14 +31,11 @@
  	of_chosen = of_find_node_by_path("/chosen");
  	if (of_chosen == NULL)
  		of_chosen = of_find_node_by_path("/chosen at 0");
-@@ -1874,7 +1875,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
-			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
+@@ -2039,7 +2040,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
+ 			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
  	}
  
 -	of_aliases = of_find_node_by_path("/aliases");
  	if (!of_aliases)
  		return;
  
--- 
-2.1.4
-