diff options
| author | Shuah Khan <shuah.kh@samsung.com> | 2014-07-11 18:25:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-26 11:15:17 -0300 |
| commit | cc5c5d20c3cb9066576043b937b35d6b669a52e0 (patch) | |
| tree | 5807d86fa82fe1a1c2af871d7b1094486aad5157 | |
| parent | b89193e0b06f44f48e3bf897a5b5cb4a7aff3359 (diff) | |
| download | op-kernel-dev-cc5c5d20c3cb9066576043b937b35d6b669a52e0.zip op-kernel-dev-cc5c5d20c3cb9066576043b937b35d6b669a52e0.tar.gz | |
[media] media: em28xx - fix i2c_xfer to return -ENODEV when dev is removed
In em28xx usb disconnect code path, some dvb fe and tuner drivers
attempt i2c transfers from their release interfaces. When device
is removed, return -ENODEV instead of attempting to transfer data
over i2c.
Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-i2c.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index b58d4eb..1048c1a 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -501,6 +501,12 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, int addr, rc, i; u8 reg; + /* prevent i2c xfer attempts after device is disconnected + some fe's try to do i2c writes/reads from their release + interfaces when called in disconnect path */ + if (dev->disconnected) + return -ENODEV; + rc = rt_mutex_trylock(&dev->i2c_bus_lock); if (rc < 0) return rc; |
