diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-12 11:34:38 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-12 11:34:38 +0200 |
| commit | 5d9abf072da54a382d318a6a23bc4d65d1c9f6a7 (patch) | |
| tree | 0091520c14854a60961fc21d8942a1cf32ffa56b /linux/drivers/media/dvb/frontends/drx397xD.c | |
| parent | 0b44aa87bd1a08f0c6c64872413937415f5cc7e9 (diff) | |
| parent | 5d6597046c8d57aa650a06343c4d63ba7dbe57dc (diff) | |
| download | mediapointer-dvb-s2-5d9abf072da54a382d318a6a23bc4d65d1c9f6a7.tar.gz mediapointer-dvb-s2-5d9abf072da54a382d318a6a23bc4d65d1c9f6a7.tar.bz2 | |
merge: from v4l-dvb
Diffstat (limited to 'linux/drivers/media/dvb/frontends/drx397xD.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/drx397xD.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/frontends/drx397xD.c b/linux/drivers/media/dvb/frontends/drx397xD.c index 327fff4b8..52a9a6553 100644 --- a/linux/drivers/media/dvb/frontends/drx397xD.c +++ b/linux/drivers/media/dvb/frontends/drx397xD.c @@ -74,7 +74,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, \ @@ -110,7 +110,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; @@ -194,7 +194,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)) { @@ -215,7 +215,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; |