Merge remote-tracking branch 'patjak/master' into my_fixes

This commit is contained in:
Sven Schnelle
2015-11-28 23:11:00 +01:00
10 changed files with 61 additions and 78 deletions

View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2014 Patrik Jakobsson (patrik.r.jakobsson@gmail.com)
*
@@ -17,6 +17,7 @@
*
*/
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/acpi.h>
#include <linux/firmware.h>
@@ -274,7 +275,7 @@ static int fthd_isp_cmd(struct fthd_private *dev_priv, enum fthd_isp_cmds comman
memset(&cmd, 0, sizeof(cmd));
if (response_len) {
len = MAX(request_len, *response_len);
len = max(request_len, *response_len);
} else {
len = request_len;
}