Commit 0838a4ef authored by David S. Miller's avatar David S. Miller

Merge branch 'net-qca_spi-Minor-bugfixes'

Stefan Wahren says:

====================
net: qca_spi: Minor bugfixes

This patch series contains some minor bugfixes for
the qca_spi driver.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 169dc027 50973993
...@@ -658,7 +658,7 @@ qcaspi_netdev_open(struct net_device *dev) ...@@ -658,7 +658,7 @@ qcaspi_netdev_open(struct net_device *dev)
return ret; return ret;
} }
netif_start_queue(qca->net_dev); /* SPI thread takes care of TX queue */
return 0; return 0;
} }
...@@ -760,6 +760,9 @@ qcaspi_netdev_tx_timeout(struct net_device *dev) ...@@ -760,6 +760,9 @@ qcaspi_netdev_tx_timeout(struct net_device *dev)
qca->net_dev->stats.tx_errors++; qca->net_dev->stats.tx_errors++;
/* Trigger tx queue flush and QCA7000 reset */ /* Trigger tx queue flush and QCA7000 reset */
qca->sync = QCASPI_SYNC_UNKNOWN; qca->sync = QCASPI_SYNC_UNKNOWN;
if (qca->spi_thread)
wake_up_process(qca->spi_thread);
} }
static int static int
...@@ -878,22 +881,22 @@ qca_spi_probe(struct spi_device *spi) ...@@ -878,22 +881,22 @@ qca_spi_probe(struct spi_device *spi)
if ((qcaspi_clkspeed < QCASPI_CLK_SPEED_MIN) || if ((qcaspi_clkspeed < QCASPI_CLK_SPEED_MIN) ||
(qcaspi_clkspeed > QCASPI_CLK_SPEED_MAX)) { (qcaspi_clkspeed > QCASPI_CLK_SPEED_MAX)) {
dev_info(&spi->dev, "Invalid clkspeed: %d\n", dev_err(&spi->dev, "Invalid clkspeed: %d\n",
qcaspi_clkspeed); qcaspi_clkspeed);
return -EINVAL; return -EINVAL;
} }
if ((qcaspi_burst_len < QCASPI_BURST_LEN_MIN) || if ((qcaspi_burst_len < QCASPI_BURST_LEN_MIN) ||
(qcaspi_burst_len > QCASPI_BURST_LEN_MAX)) { (qcaspi_burst_len > QCASPI_BURST_LEN_MAX)) {
dev_info(&spi->dev, "Invalid burst len: %d\n", dev_err(&spi->dev, "Invalid burst len: %d\n",
qcaspi_burst_len); qcaspi_burst_len);
return -EINVAL; return -EINVAL;
} }
if ((qcaspi_pluggable < QCASPI_PLUGGABLE_MIN) || if ((qcaspi_pluggable < QCASPI_PLUGGABLE_MIN) ||
(qcaspi_pluggable > QCASPI_PLUGGABLE_MAX)) { (qcaspi_pluggable > QCASPI_PLUGGABLE_MAX)) {
dev_info(&spi->dev, "Invalid pluggable: %d\n", dev_err(&spi->dev, "Invalid pluggable: %d\n",
qcaspi_pluggable); qcaspi_pluggable);
return -EINVAL; return -EINVAL;
} }
...@@ -955,8 +958,8 @@ qca_spi_probe(struct spi_device *spi) ...@@ -955,8 +958,8 @@ qca_spi_probe(struct spi_device *spi)
} }
if (register_netdev(qcaspi_devs)) { if (register_netdev(qcaspi_devs)) {
dev_info(&spi->dev, "Unable to register net device %s\n", dev_err(&spi->dev, "Unable to register net device %s\n",
qcaspi_devs->name); qcaspi_devs->name);
free_netdev(qcaspi_devs); free_netdev(qcaspi_devs);
return -EFAULT; return -EFAULT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment