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

Commit 31473c28 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Marc Kleine-Budde
Browse files

can: mcp251x: Check return value of spi_setup() 



This patch moves setup of SPI bus a bit earlier and adds check for spi_setup()
result to be sure SPI bus is communicating with the device properly.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Tested-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 6afc0d7a

drivers/net/can/mcp251x.c

+13 −12
Original line number Diff line number Diff line
@@ -1032,8 +1032,8 @@ static int mcp251x_can_probe(struct spi_device *spi) 
	struct mcp251x_platform_data *pdata = dev_get_platdata(&spi->dev);

	struct net_device *net;

	struct mcp251x_priv *priv;

	int freq, ret = -ENODEV;

	struct clk *clk;

	int freq, ret;



	clk = devm_clk_get(&spi->dev, NULL);

	if (IS_ERR(clk)) {
@@ -1076,6 +1076,18 @@ static int mcp251x_can_probe(struct spi_device *spi) 
	priv->net = net;

	priv->clk = clk;



	spi_set_drvdata(spi, priv);



	/* Configure the SPI bus */

	spi->bits_per_word = 8;

	if (mcp251x_is_2510(spi))

		spi->max_speed_hz = spi->max_speed_hz ? : 5 * 1000 * 1000;

	else

		spi->max_speed_hz = spi->max_speed_hz ? : 10 * 1000 * 1000;

	ret = spi_setup(spi);

	if (ret)

		goto out_clk;



	priv->power = devm_regulator_get(&spi->dev, "vdd");

	priv->transceiver = devm_regulator_get(&spi->dev, "xceiver");

	if ((PTR_ERR(priv->power) == -EPROBE_DEFER) ||
@@ -1088,8 +1100,6 @@ static int mcp251x_can_probe(struct spi_device *spi) 
	if (ret)

		goto out_clk;



	spi_set_drvdata(spi, priv);



	priv->spi = spi;

	mutex_init(&priv->mcp_lock);
@@ -1134,15 +1144,6 @@ static int mcp251x_can_probe(struct spi_device *spi) 


	SET_NETDEV_DEV(net, &spi->dev);



	/* Configure the SPI bus */

	spi->mode = spi->mode ? : SPI_MODE_0;

	if (mcp251x_is_2510(spi))

		spi->max_speed_hz = spi->max_speed_hz ? : 5 * 1000 * 1000;

	else

		spi->max_speed_hz = spi->max_speed_hz ? : 10 * 1000 * 1000;

	spi->bits_per_word = 8;

	spi_setup(spi);



	/* Here is OK to not lock the MCP, no one knows about it yet */

	if (!mcp251x_hw_probe(spi)) {

		ret = -ENODEV;