diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-21 17:49:57 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-21 17:49:57 +0200 |
| commit | ff5f149b6aec8edbfa3698721667acd043009a33 (patch) | |
| tree | d052553eb296dfee3f01b1cb2b717cb7ccf3127a /drivers/serial/mpc52xx_uart.c | |
| parent | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip... (diff) | |
| parent | perf: Optimize perf_tp_event_match() (diff) | |
| download | linux-ff5f149b6aec8edbfa3698721667acd043009a33.tar.xz linux-ff5f149b6aec8edbfa3698721667acd043009a33.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7
Conflicts:
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/trace/trace_event_perf.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index a176ab4bd65b..02469c31bf0b 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -1467,7 +1467,7 @@ mpc52xx_uart_init(void) /* * Map the PSC FIFO Controller and init if on MPC512x. */ - if (psc_ops->fifoc_init) { + if (psc_ops && psc_ops->fifoc_init) { ret = psc_ops->fifoc_init(); if (ret) return ret; |