Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3951ad2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 

Pull x86 platform driver revert from Matthew Garrett:
 "This clearly shouldn't have been merged.  No excuse on my part"

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  Revert "platform/x86/toshiba-apci.c possible bad if test?"
parents e9de42d8 8039aabb

drivers/platform/x86/toshiba_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev, 
	int mode = -1;

	int time = -1;



	if (sscanf(buf, "%i", &mode) != 1  || (mode != 2 || mode != 1))

	if (sscanf(buf, "%i", &mode) != 1 && (mode != 2 || mode != 1))

		return -EINVAL;



	/* Set the Keyboard Backlight Mode where: