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

Commit 297a0ae3 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mauro Carvalho Chehab
Browse files

[media] adv7180: Fix remove order 



The mutex is used in the subdev callbacks, so unregister the subdev before the
mutex is destroyed.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent e2543658

drivers/media/i2c/adv7180.c

+2 −2
Original line number Diff line number Diff line
@@ -616,8 +616,8 @@ static int adv7180_probe(struct i2c_client *client, 
err_free_ctrl:

	adv7180_exit_controls(state);

err_unreg_subdev:

	mutex_destroy(&state->mutex);

	v4l2_device_unregister_subdev(sd);

	mutex_destroy(&state->mutex);

err:

	printk(KERN_ERR KBUILD_MODNAME ": Failed to probe: %d\n", ret);

	return ret;
@@ -640,8 +640,8 @@ static int adv7180_remove(struct i2c_client *client) 
		}

	}



	mutex_destroy(&state->mutex);

	v4l2_device_unregister_subdev(sd);

	mutex_destroy(&state->mutex);

	return 0;

}