net/axgbe: fix unreleased lock in I2C transfer

The lock pdata->i2c_mutex is not released if the function return in
these two patched branches, which may lead to deadlock problem if
this lock is acquired again.

Bugzilla ID: 777
Fixes: 4ac7516b8b39 ("net/axgbe: add phy init and related APIs")
Cc: stable@dpdk.org
Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/net/axgbe/axgbe_i2c.c b/drivers/net/axgbe/axgbe_i2c.c
index ab3738a12e8c939927eb972cab380482a49650ab..a2798f484e723e12450f43d8e34a06a938234bc7 100644 (file)
--- a/drivers/net/axgbe/axgbe_i2c.c
+++ b/drivers/net/axgbe/axgbe_i2c.c
@@ -233,6 +233,7 @@ static int axgbe_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *op)
        ret = axgbe_i2c_disable(pdata);
        if (ret) {
                PMD_DRV_LOG(ERR, "failed to disable i2c master\n");
+               pthread_mutex_unlock(&pdata->i2c_mutex);
                return ret;
        }
 
@@ -249,6 +250,7 @@ static int axgbe_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *op)
        ret = axgbe_i2c_enable(pdata);
        if (ret) {
                PMD_DRV_LOG(ERR, "failed to enable i2c master\n");
+               pthread_mutex_unlock(&pdata->i2c_mutex);
                return ret;
        }