Author: eelco Date: Sun Jul 25 12:15:59 2010 New Revision: 22730 URL: https://svn.nixos.org/websvn/nix/?rev=22730&sc=1
Log: * Ensure that the dell-bluetooth device does not stay in the "hard blocked" state. Added: nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/dell-rfkill.patch Modified: nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/patches.nix nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Added: nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/dell-rfkill.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/dell-rfkill.patch Sun Jul 25 12:15:59 2010 (r22730) @@ -0,0 +1,23 @@ +Ensure that the dell-bluetooth device does not stay in the "hard +blocked" state. + +From https://patchwork.kernel.org/patch/37539/ + +diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c +index 74909c4..cf40c4e 100644 +--- a/drivers/platform/x86/dell-laptop.c ++++ b/drivers/platform/x86/dell-laptop.c +@@ -197,8 +197,11 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) + dell_send_request(&buffer, 17, 11); + status = buffer.output[1]; + +- if (status & BIT(bit)) +- rfkill_set_hw_state(rfkill, !!(status & BIT(16))); ++ /* ++ * Don't change state unless the read-only HW rfkill switch is disabled. ++ */ ++ if (status & BIT(16)) ++ rfkill_set_hw_state(rfkill, !!(status & BIT(bit))); + } + + static const struct rfkill_ops dell_rfkill_ops = { Modified: nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/patches.nix ============================================================================== --- nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/patches.nix Sun Jul 25 11:10:10 2010 (r22729) +++ nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/patches.nix Sun Jul 25 12:15:59 2010 (r22730) @@ -172,5 +172,10 @@ }; features.noXsave = true; }; + + dell_rfkill = + { name = "dell-rfkill"; + patch = ./dell-rfkill.patch; + }; } Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Sun Jul 25 11:10:10 2010 (r22729) +++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Sun Jul 25 12:15:59 2010 (r22730) @@ -6523,6 +6523,7 @@ kernelPatches.aufs2_2_6_32 kernelPatches.cifs_timeout kernelPatches.no_xsave + kernelPatches.dell_rfkill ]; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
