Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx25840 / cx25840-firmware.c

diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 1ddf724a2c74ca6332dd52e1f702dfc4bf18aba0..620d295947abd5299ac86337eceb3407e1d3527e 100644 (file)
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/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);