1. 14 9月, 2012 3 次提交
  2. 12 9月, 2012 2 次提交
  3. 10 9月, 2012 4 次提交
  4. 07 9月, 2012 1 次提交
    • M
      [media] move i2c files into drivers/media/i2c · 1daae517
      Mauro Carvalho Chehab 提交于
      Based on a patch from Sylvester Nawrocki
      
      This fixes regression introduced with commmit cb7a01ac,
      "[media] move i2c files into drivers/media/i2c".
      
      The linked order affect what drivers will be initialized first, when
      they're built-in at Kernel. While there are macros that allow changing
      the init order, like subsys_initcall(), late_initcall() & friends,
      when all drivers  linked belong to the same subsystem, it is easier
      to change the order at the Makefile.
      
      All I2C modules must be linked before any drivers that actually use it,
      in order to ensure proper module initialization order.
      
      Also, the core drivers should be initialized before the drivers that use
      them.
      
      This patch reorders the drivers init, in order to fulfill the above
      requirements.
      Reported-by: NSylwester Nawrocki <sylvester.nawrocki@gmail.com>
      Acked-by: NSylwester Nawrocki <sylvester.nawrocki@gmail.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      1daae517
  5. 22 8月, 2012 20 次提交
  6. 21 8月, 2012 10 次提交
    • A
      Revert "drm/radeon: fix bo creation retry path" · 676bc2e1
      Alex Deucher 提交于
      This reverts commit d1c7871d.
      
      ttm_bo_init() destroys the BO on failure. So this patch makes
      the retry path work with freed memory.  This ends up causing
      kernel panics when this path is hit.
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      676bc2e1
    • M
      [media] saa7164: Add dependency for V4L2 core · b4c723e6
      Mauro Carvalho Chehab 提交于
      As Reported by Randy:
      
      > drivers/built-in.o: In function `fops_open':
      > saa7164-encoder.c:(.text+0x68ed6f): undefined reference to `video_devdata'
      > drivers/built-in.o: In function `fill_queryctrl.clone.4':
      > saa7164-encoder.c:(.text+0x68f657): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-encoder.c:(.text+0x68f6a9): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-encoder.c:(.text+0x68f6e0): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-encoder.c:(.text+0x68f71a): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-encoder.c:(.text+0x68f73a): undefined reference to `v4l2_ctrl_query_fill'
      > drivers/built-in.o:saa7164-encoder.c:(.text+0x68f757): more undefined references to `v4l2_ctrl_query_fill' follow
      > drivers/built-in.o: In function `saa7164_encoder_register':
      > (.text+0x68fff7): undefined reference to `video_device_alloc'
      > drivers/built-in.o: In function `saa7164_encoder_register':
      > (.text+0x690073): undefined reference to `video_device_release'
      > drivers/built-in.o: In function `saa7164_encoder_register':
      > (.text+0x6900a1): undefined reference to `__video_register_device'
      > drivers/built-in.o: In function `saa7164_encoder_unregister':
      > (.text+0x690243): undefined reference to `video_unregister_device'
      > drivers/built-in.o: In function `saa7164_encoder_unregister':
      > (.text+0x690269): undefined reference to `video_device_release'
      > drivers/built-in.o: In function `fops_open':
      > saa7164-vbi.c:(.text+0x69125f): undefined reference to `video_devdata'
      > drivers/built-in.o: In function `fill_queryctrl.clone.4':
      > saa7164-vbi.c:(.text+0x6919b4): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-vbi.c:(.text+0x6919ee): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-vbi.c:(.text+0x691a23): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-vbi.c:(.text+0x691a47): undefined reference to `v4l2_ctrl_query_fill'
      > saa7164-vbi.c:(.text+0x691a6a): undefined reference to `v4l2_ctrl_query_fill'
      > drivers/built-in.o:saa7164-vbi.c:(.text+0x691a87): more undefined references to `v4l2_ctrl_query_fill' follow
      > drivers/built-in.o: In function `saa7164_vbi_register':
      > (.text+0x69220e): undefined reference to `video_device_alloc'
      > drivers/built-in.o: In function `saa7164_vbi_register':
      > (.text+0x69228a): undefined reference to `video_device_release'
      > drivers/built-in.o: In function `saa7164_vbi_register':
      > (.text+0x6922bb): undefined reference to `__video_register_device'
      > drivers/built-in.o: In function `saa7164_vbi_unregister':
      > (.text+0x6923de): undefined reference to `video_unregister_device'
      > drivers/built-in.o: In function `saa7164_vbi_unregister':
      > (.text+0x6923f9): undefined reference to `video_device_release'
      > drivers/built-in.o:(.rodata+0xb1054): undefined reference to `video_ioctl2'
      > drivers/built-in.o:(.rodata+0xb17d4): undefined reference to `video_ioctl2'
      
      That's due to the lack of an explicit Kconfig dependency for the V4L2 core.
      Reported-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      b4c723e6
    • M
      [media] Kconfig: Fix b2c2 common code selection · 01b0c11a
      Mauro Carvalho Chehab 提交于
      As reported by Randy:
      
      > flexcop-pci.c:(.text+0x19af63): undefined reference to `flexcop_device_exit'
      > flexcop-pci.c:(.text+0x19af77): undefined reference to `flexcop_device_kfree'
      > flexcop-pci.c:(.text+0x19b10f): undefined reference to `flexcop_pass_dmx_packets'
      > flexcop-pci.c:(.text+0x19b182): undefined reference to `flexcop_pass_dmx_data'
      > flexcop-pci.c:(.text+0x19b1ae): undefined reference to `flexcop_pass_dmx_data'
      > flexcop-pci.c:(.text+0x19b1f8): undefined reference to `flexcop_device_kmalloc'
      > flexcop-pci.c:(.text+0x19b256): undefined reference to `flexcop_i2c_request'
      > flexcop-pci.c:(.text+0x19b261): undefined reference to `flexcop_eeprom_check_mac_addr'
      > flexcop-pci.c:(.text+0x19b2c6): undefined reference to `flexcop_device_initialize'
      > flexcop-pci.c:(.text+0x19b332): undefined reference to `flexcop_sram_set_dest'
      > flexcop-pci.c:(.text+0x19b348): undefined reference to `flexcop_sram_set_dest'
      > flexcop-pci.c:(.text+0x19b3f8): undefined reference to `flexcop_device_exit'
      > flexcop-pci.c:(.text+0x19b408): undefined reference to `flexcop_device_kfree'
      > flexcop-pci.c:(.text+0x19b4a2): undefined reference to `flexcop_pid_feed_control'
      > flexcop-pci.c:(.text+0x19b4d7): undefined reference to `flexcop_pid_feed_control'
      >
      > since it is possible to enable DVB_B2C2_FLEXCOP_PCI
      > when CONFIG_I2C is not enabled, but then DVB_B2C2_FLEXCOP
      > is not enabled because I2C is not enabled.
      Reported-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      01b0c11a
    • H
      [media] Fix vino compilation · 090836dd
      Hans Verkuil 提交于
      A trivial fix so that vino can find the saa7191.h header.
      
      [mchehab@redhat.com: Fix merge conflict]
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      090836dd
    • A
      gpio: bt8xx: Fix build error due to missing include file · 52d32258
      Axel Lin 提交于
      This patch fixes below build error:
      
        CC [M]  drivers/gpio/gpio-bt8xx.o
      drivers/gpio/gpio-bt8xx.c:53:40: fatal error: ../media/video/bt8xx/bt848.h: No such file or directory
      compilation terminated.
      make[2]: *** [drivers/gpio/gpio-bt8xx.o] Error 1
      make[1]: *** [drivers/gpio] Error 2
      make: *** [drivers] Error 2
      
      drivers/media/video/bt8xx/bt848.h is moved to drivers/media/pci/bt8xx/bt848.h
      by commit 68de959f
      "[media] bt8xx: move analog TV part to be together with DTV one".
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      52d32258
    • M
      [media] Add missing help for some menuconfig items · e9d2f057
      Mauro Carvalho Chehab 提交于
      Help was missing during some items reorganization. Add them.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      e9d2f057
    • M
      [media] flexcop: Show the item to enable debug after the driver · 8511f8ea
      Mauro Carvalho Chehab 提交于
      Instead of showing the option to show debug at the end, show
      it after each driver.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      8511f8ea
    • M
      [media] Kconfig: merge all customise options into just one · fccea74f
      Mauro Carvalho Chehab 提交于
      Instead of having 3 options to allow customizing the media
      sub-drivers (tuners, I2C drivers, frontends), merge all of
      them into just one.
      
      That simplifies the life for users, as they can just keep
      this untouched.
      
      Life for developers is also simpler, as there's now just
      one Kconfig item to remember, for the ancillary sub-drivers
      providing supports for chips that could change from one
      board design to another.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      fccea74f
    • M
      [media] Kconfig: use menuconfig instead of menu · fc2bbfb2
      Mauro Carvalho Chehab 提交于
      This allows disabling all drivers of a certain type as a hole
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      fc2bbfb2
    • M
      [media] Cleanup media Kconfig files · b6334460
      Mauro Carvalho Chehab 提交于
      - get rid of ridden V4L2_COMMON symbol
      
        This symbol is not needed anymore; it can be folded with V4L2
        one, simplifying the Kconfig a little bit;
      
      - Comment why some Kconfig items are needed;
      
      - Remove if test for MEDIA_CAMERA_SUPPORT, replacing it by
        depends on.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      b6334460