From: David Howells <dhowells@redhat.com>
Date: Tue, 8 Jul 2008 15:56:04 +0000 (-0300)
Subject: V4L/DVB (8247): Fix a const pointer assignment error in the drx397xD demodulator... 
X-Git-Tag: v2.6.27-rc1~31^2~99
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e272ae088fccf0e98ee0042392bd52a3455f28bd;p=linux-2.6-omap-h63xx.git

V4L/DVB (8247): Fix a const pointer assignment error in the drx397xD demodulator driver

Fix an assignment of a const pointer to a non-const pointer in the drx397xD
demodulator driver.

This was introduced in patch eb9bd0e567365d4f607d32d8c41e201da65aa971.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index d71cce93d08..3cbed874a6f 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -73,7 +73,7 @@ static struct {
 	const struct firmware *file;
 	rwlock_t lock;
 	int refcnt;
-	u8 *data[ARRAY_SIZE(blob_name)];
+	const u8 *data[ARRAY_SIZE(blob_name)];
 } fw[] = {
 #define _FW_ENTRY(a, b)		{			\
 			.name	= a,			\
@@ -109,7 +109,7 @@ static void drx_release_fw(struct drx397xD_state *s)
 
 static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)
 {
-	u8 *data;
+	const u8 *data;
 	size_t size, len;
 	int i = 0, j, rc = -EINVAL;
 
@@ -193,7 +193,7 @@ static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)
 static int write_fw(struct drx397xD_state *s, blob_ix_t ix)
 {
 	struct i2c_msg msg = {.addr = s->config.demod_address,.flags = 0 };
-	u8 *data;
+	const u8 *data;
 	int len, rc = 0, i = 0;
 
 	if (ix < 0 || ix >= ARRAY_SIZE(blob_name)) {
@@ -214,7 +214,7 @@ static int write_fw(struct drx397xD_state *s, blob_ix_t ix)
 		case 0:	/* bytecode */
 			len = data[i++];
 			msg.len = len;
-			msg.buf = &data[i];
+			msg.buf = (__u8 *) &data[i];
 			if (i2c_transfer(s->i2c, &msg, 1) != 1) {
 				rc = -EIO;
 				goto exit_rc;