diff options
| author |   Nicholas Mc Guire <der.herr@hofr.at> | 2015-02-01 03:34:34 -0500 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2015-02-04 14:06:43 +0100 |
| commit | 8a00785edd166361e08c6cf710bf3acdd6038005 (patch) | |
| tree | e569c83b41d1683b39ea9a09755b02e45b825f1e /drivers/net/can/janz-ican3.c | |
| parent | Merge branch 'netlabel-next' (diff) | |
| download | linux-dev-8a00785edd166361e08c6cf710bf3acdd6038005.tar.xz linux-dev-8a00785edd166361e08c6cf710bf3acdd6038005.zip | |
can: janz-ican3: fix type mismatch in assignment
return type of wait_for_completion_timeout is unsigned long not int, this patch
removes the type mismatch by moving the call into the condition.
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/janz-ican3.c')
| -rw-r--r-- | drivers/net/can/janz-ican3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index 0eb4d181ae4d..4dd183a3643a 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -1679,8 +1679,7 @@ static int ican3_get_berr_counter(const struct net_device *ndev, if (ret) return ret; - ret = wait_for_completion_timeout(&mod->buserror_comp, HZ); - if (ret == 0) { + if (!wait_for_completion_timeout(&mod->buserror_comp, HZ)) { netdev_info(mod->ndev, "%s timed out\n", __func__); return -ETIMEDOUT; } @@ -1705,8 +1704,7 @@ static ssize_t ican3_sysfs_show_term(struct device *dev, if (ret) return ret; - ret = wait_for_completion_timeout(&mod->termination_comp, HZ); - if (ret == 0) { + if (!wait_for_completion_timeout(&mod->termination_comp, HZ)) { netdev_info(mod->ndev, "%s timed out\n", __func__); return -ETIMEDOUT; } |