Commit 155ec9e6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

Merge branch 'work-fixes'

parents 8e2cc1af 8a59822f
...@@ -216,7 +216,7 @@ struct dmx_frontend { ...@@ -216,7 +216,7 @@ struct dmx_frontend {
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* /*
* Flags OR'ed in the capabilites field of struct dmx_demux. * Flags OR'ed in the capabilities field of struct dmx_demux.
*/ */
#define DMX_TS_FILTERING 1 #define DMX_TS_FILTERING 1
......
...@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_device *d) ...@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_device *d)
d->state = DVB_USB_STATE_INIT; d->state = DVB_USB_STATE_INIT;
/* check the capabilites and set appropriate variables */ /* check the capabilities and set appropriate variables */
/* speed - when running at FULL speed we need a HW PID filter */ /* speed - when running at FULL speed we need a HW PID filter */
if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) { if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {
......
...@@ -87,7 +87,7 @@ struct dvb_usb_device; ...@@ -87,7 +87,7 @@ struct dvb_usb_device;
/** /**
* struct dvb_usb_properties - properties of a dvb-usb-device * struct dvb_usb_properties - properties of a dvb-usb-device
* @caps: capabilites of the DVB USB device. * @caps: capabilities of the DVB USB device.
* @pid_filter_count: number of PID filter position in the optional hardware * @pid_filter_count: number of PID filter position in the optional hardware
* PID-filter. * PID-filter.
* *
......
...@@ -1439,7 +1439,7 @@ static int check_firmware(struct av7110* av7110) ...@@ -1439,7 +1439,7 @@ static int check_firmware(struct av7110* av7110)
len = ntohl(*(u32*) ptr); len = ntohl(*(u32*) ptr);
ptr += 4; ptr += 4;
if (len >= 512) { if (len >= 512) {
printk("dvb-ttpci: dpram file is way to big.\n"); printk("dvb-ttpci: dpram file is way too big.\n");
return -EINVAL; return -EINVAL;
} }
if (crc != crc32_le(0, ptr, len)) { if (crc != crc32_le(0, ptr, len)) {
......
...@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110) ...@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110)
/* test DEBI */ /* test DEBI */
iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);
/* FIXME: Why does Nexus CA require 2x iwdebi for first init? */
iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);
if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) { if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) {
printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: " printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: "
"%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n", "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
......
...@@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file, ...@@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
//DBG("cpia_ioctl: %u\n", ioctlnr); //DBG("cpia_ioctl: %u\n", ioctlnr);
switch (ioctlnr) { switch (ioctlnr) {
/* query capabilites */ /* query capabilities */
case VIDIOCGCAP: case VIDIOCGCAP:
{ {
struct video_capability *b = arg; struct video_capability *b = arg;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
the slave is bound to it). Otherwise it doesn't need this functions and the slave is bound to it). Otherwise it doesn't need this functions and
therfor they may not be initialized. therfor they may not be initialized.
The other fuctions are just for convenience, as they are for shure used by The other fuctions are just for convenience, as they are for sure used by
most/all of the codecs. The last ones may be ommited, too. most/all of the codecs. The last ones may be ommited, too.
See the structure declaration below for more information and which data has See the structure declaration below for more information and which data has
......
...@@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr) ...@@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr)
while (!(zr36050_read_status1(ptr) & 0x4)) { while (!(zr36050_read_status1(ptr) & 0x4)) {
udelay(1); udelay(1);
if (i++ > 200000) { // 200ms, there is for shure something wrong!!! if (i++ > 200000) { // 200ms, there is for sure something wrong!!!
dprintk(1, dprintk(1,
"%s: timout at wait_end (last status: 0x%02x)\n", "%s: timout at wait_end (last status: 0x%02x)\n",
ptr->name, ptr->status1); ptr->name, ptr->status1);
......
...@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr) ...@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr)
while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) { while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) {
udelay(1); udelay(1);
if (i++ > 200000) { // 200ms, there is for shure something wrong!!! if (i++ > 200000) { // 200ms, there is for sure something wrong!!!
dprintk(1, dprintk(1,
"%s: timout at wait_end (last status: 0x%02x)\n", "%s: timout at wait_end (last status: 0x%02x)\n",
ptr->name, ptr->status); ptr->name, ptr->status);
......
...@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id) ...@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id)
case I2C_DRIVERID_VIDEODECODER: case I2C_DRIVERID_VIDEODECODER:
DEBUG(printk(CARD_INFO "decoder attached\n",CARD)); DEBUG(printk(CARD_INFO "decoder attached\n",CARD));
/* fetch the capabilites of the decoder */ /* fetch the capabilities of the decoder */
rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc); rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc);
if (rv) { if (rv) {
DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD)); DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment