tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'work-fixes'

Mauro Carvalho Chehab 155ec9e6 8e2cc1af

+12 -9
unified split
+1 -1
drivers/media/dvb/dvb-core/demux.h
··· 216 216 /*--------------------------------------------------------------------------*/ 217 217 218 218 /* 219 - * Flags OR'ed in the capabilites field of struct dmx_demux. 219 + * Flags OR'ed in the capabilities field of struct dmx_demux. 220 220 */ 221 221 222 222 #define DMX_TS_FILTERING 1
+1 -1
drivers/media/dvb/dvb-usb/dvb-usb-init.c
··· 47 47 48 48 d->state = DVB_USB_STATE_INIT; 49 49 50 - /* check the capabilites and set appropriate variables */ 50 + /* check the capabilities and set appropriate variables */ 51 51 52 52 /* speed - when running at FULL speed we need a HW PID filter */ 53 53 if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {
+1 -1
drivers/media/dvb/dvb-usb/dvb-usb.h
··· 87 87 88 88 /** 89 89 * struct dvb_usb_properties - properties of a dvb-usb-device 90 - * @caps: capabilites of the DVB USB device. 90 + * @caps: capabilities of the DVB USB device. 91 91 * @pid_filter_count: number of PID filter position in the optional hardware 92 92 * PID-filter. 93 93 *
+1 -1
drivers/media/dvb/ttpci/av7110.c
··· 1439 1439 len = ntohl(*(u32*) ptr); 1440 1440 ptr += 4; 1441 1441 if (len >= 512) { 1442 - printk("dvb-ttpci: dpram file is way to big.\n"); 1442 + printk("dvb-ttpci: dpram file is way too big.\n"); 1443 1443 return -EINVAL; 1444 1444 } 1445 1445 if (crc != crc32_le(0, ptr, len)) {
+3
drivers/media/dvb/ttpci/av7110_hw.c
··· 245 245 246 246 /* test DEBI */ 247 247 iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); 248 + /* FIXME: Why does Nexus CA require 2x iwdebi for first init? */ 249 + iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); 250 + 248 251 if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) { 249 252 printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: " 250 253 "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
+1 -1
drivers/media/video/cpia.c
··· 3369 3369 //DBG("cpia_ioctl: %u\n", ioctlnr); 3370 3370 3371 3371 switch (ioctlnr) { 3372 - /* query capabilites */ 3372 + /* query capabilities */ 3373 3373 case VIDIOCGCAP: 3374 3374 { 3375 3375 struct video_capability *b = arg;
+1 -1
drivers/media/video/videocodec.h
··· 56 56 the slave is bound to it). Otherwise it doesn't need this functions and 57 57 therfor they may not be initialized. 58 58 59 - The other fuctions are just for convenience, as they are for shure used by 59 + The other fuctions are just for convenience, as they are for sure used by 60 60 most/all of the codecs. The last ones may be ommited, too. 61 61 62 62 See the structure declaration below for more information and which data has
+1 -1
drivers/media/video/zr36050.c
··· 159 159 160 160 while (!(zr36050_read_status1(ptr) & 0x4)) { 161 161 udelay(1); 162 - if (i++ > 200000) { // 200ms, there is for shure something wrong!!! 162 + if (i++ > 200000) { // 200ms, there is for sure something wrong!!! 163 163 dprintk(1, 164 164 "%s: timout at wait_end (last status: 0x%02x)\n", 165 165 ptr->name, ptr->status1);
+1 -1
drivers/media/video/zr36060.c
··· 161 161 162 162 while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) { 163 163 udelay(1); 164 - if (i++ > 200000) { // 200ms, there is for shure something wrong!!! 164 + if (i++ > 200000) { // 200ms, there is for sure something wrong!!! 165 165 dprintk(1, 166 166 "%s: timout at wait_end (last status: 0x%02x)\n", 167 167 ptr->name, ptr->status);
+1 -1
drivers/media/video/zr36120_i2c.c
··· 65 65 case I2C_DRIVERID_VIDEODECODER: 66 66 DEBUG(printk(CARD_INFO "decoder attached\n",CARD)); 67 67 68 - /* fetch the capabilites of the decoder */ 68 + /* fetch the capabilities of the decoder */ 69 69 rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc); 70 70 if (rv) { 71 71 DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD));