diff options
author | David Howells <dhowells@redhat.com> | 2008-07-08 11:56:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 07:09:14 -0400 |
commit | e272ae088fccf0e98ee0042392bd52a3455f28bd (patch) | |
tree | af7c79b520bd83443576702cb29c9c1165e083f1 /drivers/media/dvb/frontends | |
parent | 22b0119e09d6e7d671535c61de27753a5e1a0a63 (diff) |
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>
Diffstat (limited to 'drivers/media/dvb/frontends')
-rw-r--r-- | drivers/media/dvb/frontends/drx397xD.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index d71cce93d08e..3cbed874a6f8 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c | |||
@@ -73,7 +73,7 @@ static struct { | |||
73 | const struct firmware *file; | 73 | const struct firmware *file; |
74 | rwlock_t lock; | 74 | rwlock_t lock; |
75 | int refcnt; | 75 | int refcnt; |
76 | u8 *data[ARRAY_SIZE(blob_name)]; | 76 | const u8 *data[ARRAY_SIZE(blob_name)]; |
77 | } fw[] = { | 77 | } fw[] = { |
78 | #define _FW_ENTRY(a, b) { \ | 78 | #define _FW_ENTRY(a, b) { \ |
79 | .name = a, \ | 79 | .name = a, \ |
@@ -109,7 +109,7 @@ static void drx_release_fw(struct drx397xD_state *s) | |||
109 | 109 | ||
110 | static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix) | 110 | static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix) |
111 | { | 111 | { |
112 | u8 *data; | 112 | const u8 *data; |
113 | size_t size, len; | 113 | size_t size, len; |
114 | int i = 0, j, rc = -EINVAL; | 114 | int i = 0, j, rc = -EINVAL; |
115 | 115 | ||
@@ -193,7 +193,7 @@ static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix) | |||
193 | static int write_fw(struct drx397xD_state *s, blob_ix_t ix) | 193 | static int write_fw(struct drx397xD_state *s, blob_ix_t ix) |
194 | { | 194 | { |
195 | struct i2c_msg msg = {.addr = s->config.demod_address,.flags = 0 }; | 195 | struct i2c_msg msg = {.addr = s->config.demod_address,.flags = 0 }; |
196 | u8 *data; | 196 | const u8 *data; |
197 | int len, rc = 0, i = 0; | 197 | int len, rc = 0, i = 0; |
198 | 198 | ||
199 | if (ix < 0 || ix >= ARRAY_SIZE(blob_name)) { | 199 | if (ix < 0 || ix >= ARRAY_SIZE(blob_name)) { |
@@ -214,7 +214,7 @@ static int write_fw(struct drx397xD_state *s, blob_ix_t ix) | |||
214 | case 0: /* bytecode */ | 214 | case 0: /* bytecode */ |
215 | len = data[i++]; | 215 | len = data[i++]; |
216 | msg.len = len; | 216 | msg.len = len; |
217 | msg.buf = &data[i]; | 217 | msg.buf = (__u8 *) &data[i]; |
218 | if (i2c_transfer(s->i2c, &msg, 1) != 1) { | 218 | if (i2c_transfer(s->i2c, &msg, 1) != 1) { |
219 | rc = -EIO; | 219 | rc = -EIO; |
220 | goto exit_rc; | 220 | goto exit_rc; |