diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-02-01 06:05:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 11:53:12 -0500 |
| commit | b6557fbca805217588a412f391a65ceafcf1a1af (patch) | |
| tree | 2739d606680c2f68fc33def5d107b2862b9bfe86 | |
| parent | bc1978d404befacd272d0321ef749cc3192e488b (diff) | |
[PATCH] hrtimers: fix possible use of NULL pointer in posix-timers
Fixup the conversion of posix-timers to hrtimers.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | kernel/posix-timers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 197208b3aa2a..3b606d361b52 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
| @@ -290,7 +290,8 @@ void do_schedule_next_timer(struct siginfo *info) | |||
| 290 | info->si_overrun = timr->it_overrun_last; | 290 | info->si_overrun = timr->it_overrun_last; |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | unlock_timer(timr, flags); | 293 | if (timr) |
| 294 | unlock_timer(timr, flags); | ||
| 294 | } | 295 | } |
| 295 | 296 | ||
| 296 | int posix_timer_event(struct k_itimer *timr,int si_private) | 297 | int posix_timer_event(struct k_itimer *timr,int si_private) |