diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-06-08 11:12:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-06-08 11:12:13 -0700 |
| commit | 3475945d2045aa0ed1077c0dae87b7372aadb337 (patch) | |
| tree | 6ce880b7ba75745f73ad2324f4742e7d955a0d11 | |
| parent | efcf6b523cd252cd50e9305ec2ce7c75a298365f (diff) | |
| parent | 003cdba1c31bda9610ac882ad02ef9345c43afd0 (diff) | |
Merge "msm: v4l2loopback: Fix clang compilation error"
| -rw-r--r-- | drivers/input/touchscreen/atmel_maxtouch_ts.c | 5 | ||||
| -rw-r--r-- | drivers/media/v4l2loopback-master/v4l2loopback.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/atmel_maxtouch_ts.c b/drivers/input/touchscreen/atmel_maxtouch_ts.c index 423a055bbec6..d07ca3dc7e46 100644 --- a/drivers/input/touchscreen/atmel_maxtouch_ts.c +++ b/drivers/input/touchscreen/atmel_maxtouch_ts.c @@ -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", diff --git a/drivers/media/v4l2loopback-master/v4l2loopback.c b/drivers/media/v4l2loopback-master/v4l2loopback.c index b6e7f6a2a768..71d3f4b5a24c 100644 --- a/drivers/media/v4l2loopback-master/v4l2loopback.c +++ b/drivers/media/v4l2loopback-master/v4l2loopback.c @@ -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; |