diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-06 08:14:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-06 08:14:28 -0500 |
| commit | bd7fbd58b757263cec86d9915da168ce347a7e08 (patch) | |
| tree | 4cd8bfce0938f9173b0b2a896ab929b336479a90 /drivers | |
| parent | 8d6cbf5e6bc4e10e38b954763fa025caed517cc2 (diff) | |
| parent | 5404dfcc4dbb56a9b255e08b67b46d1181565e6f (diff) | |
Merge branch '2023-01-06-further-regression-fixes'
- Bring in a number of important regression fixes for among others,
uniphier, PXE booting, socrates, imx7d-pico, rockchip video and
rzg2_beacon as well as making the python version warning fix more
portable.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/i2c-uniphier-f.c | 4 | ||||
| -rw-r--r-- | drivers/net/tsec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c index 9d6f1688cb1..3dcd382469e 100644 --- a/drivers/i2c/i2c-uniphier-f.c +++ b/drivers/i2c/i2c-uniphier-f.c @@ -130,12 +130,12 @@ static int wait_for_irq(struct uniphier_fi2c_priv *priv, u32 flags, if (irq & I2C_INT_AL) { dev_dbg(priv->dev, "error: arbitration lost\n"); *stop = false; - return ret; + return -EDEADLK; } if (irq & I2C_INT_NA) { dev_dbg(priv->dev, "error: no answer\n"); - return ret; + return -ENODATA; } return 0; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 519ea14b070..d69a9ff4773 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -156,7 +156,7 @@ static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int join) return 0; } -static int tsec_set_promisc(struct udevice *dev, bool enable) +static int __maybe_unused tsec_set_promisc(struct udevice *dev, bool enable) { struct tsec_private *priv = dev_get_priv(dev); struct tsec __iomem *regs = priv->regs; |