Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (5496): Pluto2: fix incorrect TSCR register setting
V4L/DVB (5495): Tda10086: fix DiSEqC message length
+15
-9
+1
-1
drivers/media/dvb/frontends/tda10086.c
+1
-1
drivers/media/dvb/frontends/tda10086.c
···
212
212
for(i=0; i< cmd->msg_len; i++) {
213
213
tda10086_write_byte(state, 0x48+i, cmd->msg[i]);
214
214
}
215
-
tda10086_write_byte(state, 0x36, 0x08 | ((cmd->msg_len + 1) << 4));
215
+
tda10086_write_byte(state, 0x36, 0x08 | ((cmd->msg_len - 1) << 4));
216
216
217
217
tda10086_diseqc_wait(state);
218
218
+14
-8
drivers/media/dvb/pluto2/pluto2.c
+14
-8
drivers/media/dvb/pluto2/pluto2.c
···
149
149
writel(val, &pluto->io_mem[reg]);
150
150
}
151
151
152
+
static void pluto_write_tscr(struct pluto *pluto, u32 val)
153
+
{
154
+
/* set the number of packets */
155
+
val &= ~TSCR_ADEF;
156
+
val |= TS_DMA_PACKETS / 2;
157
+
158
+
pluto_writereg(pluto, REG_TSCR, val);
159
+
}
160
+
152
161
static void pluto_setsda(void *data, int state)
153
162
{
154
163
struct pluto *pluto = data;
···
222
213
223
214
if (val & TSCR_RSTN) {
224
215
val &= ~TSCR_RSTN;
225
-
pluto_writereg(pluto, REG_TSCR, val);
216
+
pluto_write_tscr(pluto, val);
226
217
}
227
218
if (reenable) {
228
219
val |= TSCR_RSTN;
229
-
pluto_writereg(pluto, REG_TSCR, val);
220
+
pluto_write_tscr(pluto, val);
230
221
}
231
222
}
232
223
···
348
339
}
349
340
350
341
/* ACK the interrupt */
351
-
pluto_writereg(pluto, REG_TSCR, tscr | TSCR_IACK);
342
+
pluto_write_tscr(pluto, tscr | TSCR_IACK);
352
343
353
344
return IRQ_HANDLED;
354
345
}
···
357
348
{
358
349
u32 val = pluto_readreg(pluto, REG_TSCR);
359
350
360
-
/* set the number of packets */
361
-
val &= ~TSCR_ADEF;
362
-
val |= TS_DMA_PACKETS / 2;
363
351
/* disable AFUL and LOCK interrupts */
364
352
val |= (TSCR_MSKA | TSCR_MSKL);
365
353
/* enable DMA and OVERFLOW interrupts */
···
364
358
/* clear pending interrupts */
365
359
val |= TSCR_IACK;
366
360
367
-
pluto_writereg(pluto, REG_TSCR, val);
361
+
pluto_write_tscr(pluto, val);
368
362
}
369
363
370
364
static void pluto_disable_irqs(struct pluto *pluto)
···
376
370
/* clear pending interrupts */
377
371
val |= TSCR_IACK;
378
372
379
-
pluto_writereg(pluto, REG_TSCR, val);
373
+
pluto_write_tscr(pluto, val);
380
374
}
381
375
382
376
static int __devinit pluto_hw_init(struct pluto *pluto)