Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb24a7e authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mauro Carvalho Chehab
Browse files

[media] dib9000: fix explicit lock mismatches 



There are several error paths, where &state->platform.risc.mem_mbx_lock
is not unlocked. The patch fixes it.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b47acf2a

drivers/media/dvb/frontends/dib9000.c

+5 −1
Original line number Diff line number Diff line
@@ -2208,6 +2208,7 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) 


	DibAcquireLock(&state->platform.risc.mem_mbx_lock);

	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {

		DibReleaseLock(&state->platform.risc.mem_mbx_lock);

		ret = -EIO;

		goto error;

	}
@@ -2233,8 +2234,10 @@ static u32 dib9000_get_snr(struct dvb_frontend *fe) 
	u16 val;



	DibAcquireLock(&state->platform.risc.mem_mbx_lock);

	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)

	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {

		DibReleaseLock(&state->platform.risc.mem_mbx_lock);

		return -EIO;

	}

	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);

	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
@@ -2291,6 +2294,7 @@ static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc) 
	DibAcquireLock(&state->demod_lock);

	DibAcquireLock(&state->platform.risc.mem_mbx_lock);

	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {

		DibReleaseLock(&state->platform.risc.mem_mbx_lock);

		ret = -EIO;

		goto error;

	}