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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'media/v3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
"A core fix and some driver fixes:
- regression fix in Remote Controller core affecting RC6 protocol
handling
- fix video buffer handling in cx23885
- race fix in solo6x10
- fix image selection in smiapp
- fix reported payload size on s2255drv
- two updates for MAINTAINERS file"

* tag 'media/v3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] rc-core: fix toggle handling in the rc6 decoder
MAINTAINERS: Update mchehab's addresses
[media] cx23885: use sg = sg_next(sg) instead of sg++
[media] s2255drv: fix payload size for JPG, MJPEG
[media] Update MAINTAINERS for solo6x10
[media] solo6x10: fix a race in IRQ handler
[media] smiapp: Only some selection targets are settable

Linus Torvalds ebea76f5 d0747f10

+28 -32
+20 -18
MAINTAINERS
··· 1828 1828 F: net/ax25/ 1829 1829 1830 1830 AZ6007 DVB DRIVER 1831 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 1831 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 1832 1832 L: linux-media@vger.kernel.org 1833 1833 W: http://linuxtv.org 1834 1834 T: git git://linuxtv.org/media_tree.git ··· 2198 2198 F: fs/btrfs/ 2199 2199 2200 2200 BTTV VIDEO4LINUX DRIVER 2201 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 2201 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 2202 2202 L: linux-media@vger.kernel.org 2203 2203 W: http://linuxtv.org 2204 2204 T: git git://linuxtv.org/media_tree.git ··· 2719 2719 F: include/media/cx2341x* 2720 2720 2721 2721 CX88 VIDEO4LINUX DRIVER 2722 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 2722 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 2723 2723 L: linux-media@vger.kernel.org 2724 2724 W: http://linuxtv.org 2725 2725 T: git git://linuxtv.org/media_tree.git ··· 3402 3402 EDAC-CORE 3403 3403 M: Doug Thompson <dougthompson@xmission.com> 3404 3404 M: Borislav Petkov <bp@alien8.de> 3405 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3405 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3406 3406 L: linux-edac@vger.kernel.org 3407 3407 W: bluesmoke.sourceforge.net 3408 3408 S: Supported ··· 3451 3451 F: drivers/edac/e7xxx_edac.c 3452 3452 3453 3453 EDAC-GHES 3454 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3454 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3455 3455 L: linux-edac@vger.kernel.org 3456 3456 W: bluesmoke.sourceforge.net 3457 3457 S: Maintained ··· 3479 3479 F: drivers/edac/i5000_edac.c 3480 3480 3481 3481 EDAC-I5400 3482 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3482 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3483 3483 L: linux-edac@vger.kernel.org 3484 3484 W: bluesmoke.sourceforge.net 3485 3485 S: Maintained 3486 3486 F: drivers/edac/i5400_edac.c 3487 3487 3488 3488 EDAC-I7300 3489 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3489 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3490 3490 L: linux-edac@vger.kernel.org 3491 3491 W: bluesmoke.sourceforge.net 3492 3492 S: Maintained 3493 3493 F: drivers/edac/i7300_edac.c 3494 3494 3495 3495 EDAC-I7CORE 3496 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3496 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3497 3497 L: linux-edac@vger.kernel.org 3498 3498 W: bluesmoke.sourceforge.net 3499 3499 S: Maintained ··· 3536 3536 F: drivers/edac/r82600_edac.c 3537 3537 3538 3538 EDAC-SBRIDGE 3539 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3539 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3540 3540 L: linux-edac@vger.kernel.org 3541 3541 W: bluesmoke.sourceforge.net 3542 3542 S: Maintained ··· 3596 3596 F: drivers/net/ethernet/ibm/ehea/ 3597 3597 3598 3598 EM28XX VIDEO4LINUX DRIVER 3599 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 3599 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 3600 3600 L: linux-media@vger.kernel.org 3601 3601 W: http://linuxtv.org 3602 3602 T: git git://linuxtv.org/media_tree.git ··· 5962 5962 F: drivers/media/radio/radio-maxiradio* 5963 5963 5964 5964 MEDIA INPUT INFRASTRUCTURE (V4L/DVB) 5965 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 5965 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 5966 5966 P: LinuxTV.org Project 5967 5967 L: linux-media@vger.kernel.org 5968 5968 W: http://linuxtv.org ··· 8013 8013 F: drivers/media/i2c/saa6588* 8014 8014 8015 8015 SAA7134 VIDEO4LINUX DRIVER 8016 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 8016 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 8017 8017 L: linux-media@vger.kernel.org 8018 8018 W: http://linuxtv.org 8019 8019 T: git git://linuxtv.org/media_tree.git ··· 8471 8471 F: drivers/media/radio/si4713/radio-usb-si4713.c 8472 8472 8473 8473 SIANO DVB DRIVER 8474 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 8474 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 8475 8475 L: linux-media@vger.kernel.org 8476 8476 W: http://linuxtv.org 8477 8477 T: git git://linuxtv.org/media_tree.git ··· 8682 8682 F: drivers/leds/leds-net48xx.c 8683 8683 8684 8684 SOFTLOGIC 6x10 MPEG CODEC 8685 - M: Ismael Luceno <ismael.luceno@corp.bluecherry.net> 8685 + M: Bluecherry Maintainers <maintainers@bluecherrydvr.com> 8686 + M: Andrey Utkin <andrey.utkin@corp.bluecherry.net> 8687 + M: Andrey Utkin <andrey.krieger.utkin@gmail.com> 8686 8688 L: linux-media@vger.kernel.org 8687 8689 S: Supported 8688 8690 F: drivers/media/pci/solo6x10/ ··· 9158 9156 F: drivers/media/i2c/tda9840* 9159 9157 9160 9158 TEA5761 TUNER DRIVER 9161 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 9159 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 9162 9160 L: linux-media@vger.kernel.org 9163 9161 W: http://linuxtv.org 9164 9162 T: git git://linuxtv.org/media_tree.git ··· 9166 9164 F: drivers/media/tuners/tea5761.* 9167 9165 9168 9166 TEA5767 TUNER DRIVER 9169 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 9167 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 9170 9168 L: linux-media@vger.kernel.org 9171 9169 W: http://linuxtv.org 9172 9170 T: git git://linuxtv.org/media_tree.git ··· 9478 9476 F: mm/shmem.c 9479 9477 9480 9478 TM6000 VIDEO4LINUX DRIVER 9481 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 9479 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 9482 9480 L: linux-media@vger.kernel.org 9483 9481 W: http://linuxtv.org 9484 9482 T: git git://linuxtv.org/media_tree.git ··· 10299 10297 F: arch/x86/kernel/cpu/mcheck/* 10300 10298 10301 10299 XC2028/3028 TUNER DRIVER 10302 - M: Mauro Carvalho Chehab <m.chehab@samsung.com> 10300 + M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 10303 10301 L: linux-media@vger.kernel.org 10304 10302 W: http://linuxtv.org 10305 10303 T: git git://linuxtv.org/media_tree.git
+1 -1
drivers/media/i2c/smiapp/smiapp-core.c
··· 2190 2190 ret = smiapp_set_compose(subdev, fh, sel); 2191 2191 break; 2192 2192 default: 2193 - BUG(); 2193 + ret = -EINVAL; 2194 2194 } 2195 2195 2196 2196 mutex_unlock(&sensor->mutex);
+3 -3
drivers/media/pci/cx23885/cx23885-core.c
··· 1078 1078 for (line = 0; line < lines; line++) { 1079 1079 while (offset && offset >= sg_dma_len(sg)) { 1080 1080 offset -= sg_dma_len(sg); 1081 - sg++; 1081 + sg = sg_next(sg); 1082 1082 } 1083 1083 1084 1084 if (lpi && line > 0 && !(line % lpi)) ··· 1101 1101 *(rp++) = cpu_to_le32(0); /* bits 63-32 */ 1102 1102 todo -= (sg_dma_len(sg)-offset); 1103 1103 offset = 0; 1104 - sg++; 1104 + sg = sg_next(sg); 1105 1105 while (todo > sg_dma_len(sg)) { 1106 1106 *(rp++) = cpu_to_le32(RISC_WRITE| 1107 1107 sg_dma_len(sg)); 1108 1108 *(rp++) = cpu_to_le32(sg_dma_address(sg)); 1109 1109 *(rp++) = cpu_to_le32(0); /* bits 63-32 */ 1110 1110 todo -= sg_dma_len(sg); 1111 - sg++; 1111 + sg = sg_next(sg); 1112 1112 } 1113 1113 *(rp++) = cpu_to_le32(RISC_WRITE|RISC_EOL|todo); 1114 1114 *(rp++) = cpu_to_le32(sg_dma_address(sg));
+2 -8
drivers/media/pci/solo6x10/solo6x10-core.c
··· 105 105 if (!status) 106 106 return IRQ_NONE; 107 107 108 - if (status & ~solo_dev->irq_mask) { 109 - solo_reg_write(solo_dev, SOLO_IRQ_STAT, 110 - status & ~solo_dev->irq_mask); 111 - status &= solo_dev->irq_mask; 112 - } 108 + /* Acknowledge all interrupts immediately */ 109 + solo_reg_write(solo_dev, SOLO_IRQ_STAT, status); 113 110 114 111 if (status & SOLO_IRQ_PCI_ERR) 115 112 solo_p2m_error_isr(solo_dev); ··· 128 131 129 132 if (status & SOLO_IRQ_G723) 130 133 solo_g723_isr(solo_dev); 131 - 132 - /* Clear all interrupts handled */ 133 - solo_reg_write(solo_dev, SOLO_IRQ_STAT, status); 134 134 135 135 return IRQ_HANDLED; 136 136 }
+1 -1
drivers/media/rc/ir-rc6-decoder.c
··· 259 259 case 32: 260 260 if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) { 261 261 protocol = RC_TYPE_RC6_MCE; 262 - scancode &= ~RC6_6A_MCE_TOGGLE_MASK; 263 262 toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); 263 + scancode &= ~RC6_6A_MCE_TOGGLE_MASK; 264 264 } else { 265 265 protocol = RC_BIT_RC6_6A_32; 266 266 toggle = 0;
+1 -1
drivers/media/usb/s2255/s2255drv.c
··· 632 632 break; 633 633 case V4L2_PIX_FMT_JPEG: 634 634 case V4L2_PIX_FMT_MJPEG: 635 - buf->vb.v4l2_buf.length = jpgsize; 635 + vb2_set_plane_payload(&buf->vb, 0, jpgsize); 636 636 memcpy(vbuf, tmpbuf, jpgsize); 637 637 break; 638 638 case V4L2_PIX_FMT_YUV422P: