diff options
Diffstat (limited to 'drivers/media/dvb/frontends/nxt200x.c')
-rw-r--r-- | drivers/media/dvb/frontends/nxt200x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c index bad0933eb714..aeafef46e3eb 100644 --- a/drivers/media/dvb/frontends/nxt200x.c +++ b/drivers/media/dvb/frontends/nxt200x.c | |||
@@ -44,6 +44,8 @@ | |||
44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
46 | #include <linux/moduleparam.h> | 46 | #include <linux/moduleparam.h> |
47 | #include <linux/slab.h> | ||
48 | #include <linux/string.h> | ||
47 | 49 | ||
48 | #include "dvb_frontend.h" | 50 | #include "dvb_frontend.h" |
49 | #include "dvb-pll.h" | 51 | #include "dvb-pll.h" |
@@ -337,7 +339,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data) | |||
337 | switch (state->demod_chip) { | 339 | switch (state->demod_chip) { |
338 | case NXT2004: | 340 | case NXT2004: |
339 | if (i2c_writebytes(state, state->config->pll_address, data, 4)) | 341 | if (i2c_writebytes(state, state->config->pll_address, data, 4)) |
340 | printk(KERN_WARNING "nxt200x: error writing to tuner\n"); | 342 | printk(KERN_WARNING "nxt200x: error writing to tuner\n"); |
341 | /* wait until we have a lock */ | 343 | /* wait until we have a lock */ |
342 | while (count < 20) { | 344 | while (count < 20) { |
343 | i2c_readbytes(state, state->config->pll_address, &buf, 1); | 345 | i2c_readbytes(state, state->config->pll_address, &buf, 1); |
@@ -495,7 +497,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware | |||
495 | 497 | ||
496 | /* calculate firmware CRC */ | 498 | /* calculate firmware CRC */ |
497 | for (position = 0; position < fw->size; position++) { | 499 | for (position = 0; position < fw->size; position++) { |
498 | crc = nxt200x_crc(crc, fw->data[position]); | 500 | crc = nxt200x_crc(crc, fw->data[position]); |
499 | } | 501 | } |
500 | 502 | ||
501 | buf[0] = rambase >> 8; | 503 | buf[0] = rambase >> 8; |