aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-01 08:11:20 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 12:56:36 -0500
commita7119f8629fbdb100a383b7351e1bd85274d8093 (patch)
treeb4729f4e2e2931c8562a379b055f573820a904ce
parented0e3729c9d790d17688083f070da3674088ea9c (diff)
[media] cx25840: Don't report an error if max size is adjusted
There's no reason to report: cx25840 7-0044: Firmware download size changed to 16 bytes max length If the driver needs to adjust the buffer's maximum size. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/i2c/cx25840/cx25840-firmware.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/i2c/cx25840/cx25840-firmware.c b/drivers/media/i2c/cx25840/cx25840-firmware.c
index b3169f94ece8..6092bf71300f 100644
--- a/drivers/media/i2c/cx25840/cx25840-firmware.c
+++ b/drivers/media/i2c/cx25840/cx25840-firmware.c
@@ -122,10 +122,9 @@ int cx25840_loadfw(struct i2c_client *client)
122 gpio_da = cx25840_read(client, 0x164); 122 gpio_da = cx25840_read(client, 0x164);
123 } 123 }
124 124
125 if (is_cx231xx(state) && MAX_BUF_SIZE > 16) { 125 /* cx231xx cannot accept more than 16 bytes at a time */
126 v4l_err(client, " Firmware download size changed to 16 bytes max length\n"); 126 if (is_cx231xx(state) && MAX_BUF_SIZE > 16)
127 MAX_BUF_SIZE = 16; /* cx231xx cannot accept more than 16 bytes at a time */ 127 MAX_BUF_SIZE = 16;
128 }
129 128
130 if (request_firmware(&fw, fwname, FWDEV(client)) != 0) { 129 if (request_firmware(&fw, fwname, FWDEV(client)) != 0) {
131 v4l_err(client, "unable to open firmware %s\n", fwname); 130 v4l_err(client, "unable to open firmware %s\n", fwname);