aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirk Lapray <kirk.lapray@gmail.com>2005-11-09 00:35:51 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:05 -0500
commitf93cf038d5930810e7e280e70de6e0c07ad959da (patch)
tree31bcc544ae5879ac169979a4aad1732d5e0b379e
parentb3967d6c251d8482fe42a1aad3cc292ee04c0a6b (diff)
[PATCH] dvb: Remove status check from nxt200x_readreg_multibyte
Remove status check from nxt200x_readreg_multibyte, it really shouldn't be necessary. Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Cc: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/dvb/frontends/nxt200x.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index aee170805caf..4cffe7ad9710 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -239,26 +239,16 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
239 buf = 0x80; 239 buf = 0x80;
240 nxt200x_writebytes(state, 0x21, &buf, 1); 240 nxt200x_writebytes(state, 0x21, &buf, 1);
241 241
242 /* read status */ 242 /* read the actual data */
243 nxt200x_readbytes(state, 0x21, &buf, 1); 243 for(i = 0; i < len; i++) {
244 244 nxt200x_readbytes(state, 0x36 + i, &data[i], 1);
245 if (buf == 0)
246 {
247 /* read the actual data */
248 for(i = 0; i < len; i++) {
249 nxt200x_readbytes(state, 0x36 + i, &data[i], 1);
250 }
251 return 0;
252 } 245 }
246 return 0;
253 break; 247 break;
254 default: 248 default:
255 return -EINVAL; 249 return -EINVAL;
256 break; 250 break;
257 } 251 }
258
259 printk(KERN_WARNING "nxt200x: Error reading multireg register 0x%02X\n",reg);
260
261 return 0;
262} 252}
263 253
264static void nxt200x_microcontroller_stop (struct nxt200x_state* state) 254static void nxt200x_microcontroller_stop (struct nxt200x_state* state)