]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
dev: print useful error message if the bit-timing is not valid
authorwolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Sat, 14 Feb 2009 14:27:32 +0000 (14:27 +0000)
committerwolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Sat, 14 Feb 2009 14:27:32 +0000 (14:27 +0000)
This should avoid confusion when CONFIG_CAN_CALC_BITTIMING is disabled or
"ifconfig canX up" failed due to missing bit-timing setup.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@937 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/drivers/net/can/dev.c

index 022fca7f7317ce67547b256bcff4326d278f2c53..10e81d368b07ad03242ba0905031bb816bddf59c 100644 (file)
@@ -154,6 +154,7 @@ static int can_calc_bittiming(struct net_device *dev)
 #else /* !CONFIG_CAN_CALC_BITTIMING */
 static int can_calc_bittiming(struct net_device *dev)
 {
+       dev_err(ND2D(dev), "bit-timing calculation not available\n");
        return -EINVAL;
 }
 #endif /* CONFIG_CAN_CALC_BITTIMING */
@@ -207,8 +208,10 @@ int can_set_bittiming(struct net_device *dev)
        int err;
 
        /* Check if bit-timing parameters have been pre-defined */
-       if (!priv->bittiming.tq && !priv->bittiming.bitrate)
+       if (!priv->bittiming.tq && !priv->bittiming.bitrate) {
+               dev_err(ND2D(dev), "bit-timing not yet defined\n");
                return -EINVAL;
+       }
 
        /* Check if the CAN device has bit-timing parameters */
        if (priv->bittiming_const) {