Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a00785e authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Marc Kleine-Budde
Browse files

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: default avatarNicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 7e8acbb6

drivers/net/can/janz-ican3.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

	}