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

Commit 3475945d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: v4l2loopback: Fix clang compilation error"

parents efcf6b52 003cdba1

drivers/input/touchscreen/atmel_maxtouch_ts.c

+0 −5
Original line number Diff line number Diff line
@@ -1861,11 +1861,6 @@ static int mxt_load_cfg(struct mxt_data *data, bool force) 
	int ver[3];

	u16 reg;



	if (!data->cfg_name) {

		dev_dbg(dev, "Skipping cfg download\n");

		goto report_enable;

	}



	ret = request_firmware(&cfg, data->cfg_name, dev);

	if (ret < 0) {

		dev_err(dev, "Failure to request config file %s\n",

drivers/media/v4l2loopback-master/v4l2loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ static int free_buffers(struct v4l2_loopback_device *dev) 
static void try_free_buffers(struct v4l2_loopback_device *dev)

{

	MARK();

	if (dev->open_count.counter && !dev->keep_format == 0) {

	if ((dev->open_count.counter && !dev->keep_format) == 0) {

		free_buffers(dev);

		dev->ready_for_capture = 0;

		dev->buffer_size = 0;