From 3b0a2ca889d8f55e92973ecee5c0d17957dd2068 Mon Sep 17 00:00:00 2001
From: Tyler Trafford <ttrafford@gmail.com>
Date: Tue, 22 Apr 2008 14:42:14 -0300
Subject: [PATCH] --- yaml --- r: 92396 b: refs/heads/master c:
 520ebe5f72ff450d7a73e8f669190254a5836093 h: refs/heads/master v: v3

---
 [refs]                                               |  2 +-
 trunk/drivers/media/video/cx25840/cx25840-firmware.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4fda489b9ed8..316aa52553ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491215d81049bfda749ebda007ecd3ae8bee19e3
+refs/heads/master: 520ebe5f72ff450d7a73e8f669190254a5836093
diff --git a/trunk/drivers/media/video/cx25840/cx25840-firmware.c b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
index 1ddf724a2c74..620d295947ab 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
@@ -79,11 +79,9 @@ static int check_fw_load(struct i2c_client *client, int size)
 	return 0;
 }
 
-static int fw_write(struct i2c_client *client, u8 * data, int size)
+static int fw_write(struct i2c_client *client, u8 *data, int size)
 {
-	int sent;
-
-	if ((sent = i2c_master_send(client, data, size)) < size) {
+	if (i2c_master_send(client, data, size) < size) {
 		v4l_err(client, "firmware load i2c failure\n");
 		return -ENOSYS;
 	}
@@ -96,7 +94,7 @@ int cx25840_loadfw(struct i2c_client *client)
 	struct cx25840_state *state = i2c_get_clientdata(client);
 	const struct firmware *fw = NULL;
 	u8 buffer[4], *ptr;
-	int size, send, retval;
+	int size, retval;
 
 	if (state->is_cx23885)
 		firmware = FWFILE_CX23885;
@@ -124,8 +122,7 @@ int cx25840_loadfw(struct i2c_client *client)
 	while (size > 0) {
 		ptr[0] = 0x08;
 		ptr[1] = 0x02;
-		send = size > (FWSEND - 2) ? FWSEND : size + 2;
-		retval = fw_write(client, ptr, send);
+		retval = fw_write(client, ptr, min(FWSEND, size + 2));
 
 		if (retval < 0) {
 			release_firmware(fw);