[media] m88ds3103: fix possible i2c deadlock
authorAntti Palosaari <crope@iki.fi>
Sun, 8 Dec 2013 22:19:11 +0000 (19:19 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 19 Dec 2013 11:24:25 +0000 (09:24 -0200)
Adapter is locked by I2C core already. Use unlocked i2c_transfer()
version __i2c_transfer() to avoid deadlock.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/dvb-frontends/m88ds3103.c

index 76bd85aa8f4e11fd4fe8dc8e53969153d9c28534..b5503ed025345f8363d97ef68d3de0e5048341fb 100644 (file)
@@ -1159,7 +1159,7 @@ static int m88ds3103_select(struct i2c_adapter *adap, void *mux_priv, u32 chan)
        mutex_lock(&priv->i2c_mutex);
 
        /* open tuner I2C repeater for 1 xfer, closes automatically */
-       ret = i2c_transfer(priv->i2c, gate_open_msg, 1);
+       ret = __i2c_transfer(priv->i2c, gate_open_msg, 1);
        if (ret != 1) {
                dev_warn(&priv->i2c->dev, "%s: i2c wr failed=%d\n",
                                KBUILD_MODNAME, ret);