projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933', 'bugzill...
[platform/kernel/linux-rpi.git]
/
drivers
/
acpi
/
sleep
/
proc.c
diff --git
a/drivers/acpi/sleep/proc.c
b/drivers/acpi/sleep/proc.c
index
e19eb0c
..
f8df521
100644
(file)
--- a/
drivers/acpi/sleep/proc.c
+++ b/
drivers/acpi/sleep/proc.c
@@
-178,6
+178,9
@@
static int get_date_field(char **p, u32 * value)
* Try to find delimeter, only to insert null. The end of the
* string won't have one, but is still valid.
*/
* Try to find delimeter, only to insert null. The end of the
* string won't have one, but is still valid.
*/
+ if (*p == NULL)
+ return result;
+
next = strpbrk(*p, "- :");
if (next)
*next++ = '\0';
next = strpbrk(*p, "- :");
if (next)
*next++ = '\0';
@@
-190,6
+193,8
@@
static int get_date_field(char **p, u32 * value)
if (next)
*p = next;
if (next)
*p = next;
+ else
+ *p = NULL;
return result;
}
return result;
}