linux: Adds patch for fixing wifi on raspberry pi

NixOS · Jan 10, 2019 · 43f4fb3 · 43f4fb3
1 parent 3cec224
commit 43f4fb3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
@@ -58,4 +58,8 @@ rec {
     };
   };
 
+  raspberry_pi_wifi_fix = rec {
+    name = "raspberry-pi-wifi-fix";
+    patch = ./raspberry-pi-wifi-fix.patch;
+  };
 }
diff --git a/pkgs/os-specific/linux/kernel/raspberry-pi-wifi-fix.patch b/pkgs/os-specific/linux/kernel/raspberry-pi-wifi-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
+index d0e83db42ae5..94eeed2a1b53 100644
+--- a/drivers/mmc/host/sdhci-iproc.c
++++ b/drivers/mmc/host/sdhci-iproc.c
+@@ -279,7 +279,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
+
+ 	iproc_host->data = iproc_data;
+
+-	mmc_of_parse(host->mmc);
++	ret = mmc_of_parse(host->mmc);
++	if (ret)
++		goto err;
++
+ 	sdhci_get_of_property(pdev);
+
+ 	host->mmc->caps |= iproc_host->data->mmc_caps;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -14113,6 +14113,7 @@ with pkgs;
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.raspberry_pi_wifi_fix
       ];
   };