From 2bb6c33d4e2a831cacf1b6124ff3d2ec23c19347 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 9 Nov 2011 17:07:33 +0100 Subject: [PATCH] Output device name in link change message; fixed null-pointer protections. --- master/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/master/device.c b/master/device.c index 032b4420..69c033f7 100644 --- a/master/device.c +++ b/master/device.c @@ -640,14 +640,15 @@ void ecdev_set_link( ) { if (unlikely(!device)) { - EC_MASTER_WARN(device->master, "ecdev_set_link(): No device!\n"); + EC_WARN("ecdev_set_link() called with null device!\n"); return; } if (likely(state != device->link_state)) { device->link_state = state; EC_MASTER_INFO(device->master, - "Link state changed to %s.\n", (state ? "UP" : "DOWN")); + "Link state of %s changed to %s.\n", + device->dev->name, (state ? "UP" : "DOWN")); } } @@ -662,7 +663,7 @@ uint8_t ecdev_get_link( ) { if (unlikely(!device)) { - EC_MASTER_WARN(device->master, "ecdev_get_link(): No device!\n"); + EC_WARN("ecdev_get_link() called with null device!\n"); return 0; }