Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235893
b: refs/heads/master
c: f94fdea
h: refs/heads/master
i:
  235891: 728a602
v: v3
  • Loading branch information
Timo von Holtz authored and Greg Kroah-Hartman committed Feb 9, 2011
1 parent d557649 commit ed0a982
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e79f78b331632c1812ce9c07443550aa2b6c0fe
refs/heads/master: f94fdeaa58e54c41eb6a2d8b86585e858d44c88f
5 changes: 3 additions & 2 deletions trunk/drivers/staging/quickstart/quickstart.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright (C) 2007-2010 Angelo Arrifano <miknix@gmail.com>
*
* Information gathered from disassebled dsdt and from here:
* <http://www.microsoft.com/whdc/system/platform/firmware/DirAppLaunch.mspx>
* <http://www.microsoft.com/whdc/system/platform/firmware/DirAppLaunch.mspx>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -141,7 +141,8 @@ static ssize_t pressed_button_show(struct device *dev,
char *buf)
{
return snprintf(buf, PAGE_SIZE, "%s\n",
(quickstart_data.pressed?quickstart_data.pressed->name:"none"));
(quickstart_data.pressed ?
quickstart_data.pressed->name : "none"));
}


Expand Down

0 comments on commit ed0a982

Please sign in to comment.