From 7c0273ebfaf90d8e23bbc68d23e85e8e347ea746 Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Fri, 18 Nov 2011 20:08:15 +0000 Subject: 2011-11-18 Jennifer Averett * console.c: Added a some error checks and fixed a error message. --- c/src/lib/libbsp/shared/ChangeLog | 4 ++++ c/src/lib/libbsp/shared/console.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index 4d69657f6d..882e7fa63c 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,7 @@ +2011-11-18 Jennifer Averett + + * console.c: Added a some error checks and fixed a error message. + 2011-11-10 Sebastian Huber PR 1924/cpukit diff --git a/c/src/lib/libbsp/shared/console.c b/c/src/lib/libbsp/shared/console.c index 8f9013e011..740ad47133 100644 --- a/c/src/lib/libbsp/shared/console.c +++ b/c/src/lib/libbsp/shared/console.c @@ -292,15 +292,18 @@ rtems_device_driver console_initialize( if ( (!port->deviceProbe || port->deviceProbe(minor)) && port->pDeviceFns->deviceProbe(minor)) { - status = rtems_io_register_name( port->sDeviceName, major, minor ); - if (status != RTEMS_SUCCESSFUL) { - printk( "Unable to register /dev/console\n" ); - rtems_fatal_error_occurred(status); + if (port->sDeviceName != NULL) { + status = rtems_io_register_name( port->sDeviceName, major, minor ); + if (status != RTEMS_SUCCESSFUL) { + printk( "Unable to register %s\n", port->sDeviceName ); + rtems_fatal_error_occurred(status); + } } if (minor == Console_Port_Minor) { #if defined(RTEMS_DEBUG) - printk( "Register %s as the CONSOLE\n", port->sDeviceName ); + if (port->sDeviceName != NULL) + printk( "Register %s as the CONSOLE\n", port->sDeviceName ); #endif status = rtems_io_register_name( "dev/console", major, minor ); if (status != RTEMS_SUCCESSFUL) { -- cgit v1.2.3