1. 31 7月, 2014 27 次提交
  2. 28 7月, 2014 13 次提交
    • M
      si2135: Declare the structs even if frontend is not enabled · 7f196789
      Mauro Carvalho Chehab 提交于
      As reported by Kbuildtest:
      
         In file included from drivers/media/usb/cx231xx/cx231xx-dvb.c:35:0:
         drivers/media/dvb-frontends/si2165.h:57:9: warning: 'struct si2165_config' declared inside parameter list [enabled by default]
           struct i2c_adapter *i2c)
                  ^
         drivers/media/dvb-frontends/si2165.h:57:9: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:157:21: error: variable 'hauppauge_930C_HD_1113xx_si2165_config' has initializer but incomplete type
          static const struct si2165_config hauppauge_930C_HD_1113xx_si2165_config = {
                              ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:158:2: error: unknown field 'i2c_addr' specified in initializer
           .i2c_addr = 0x64,
           ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:158:2: warning: excess elements in struct initializer [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:158:2: warning: (near initialization for 'hauppauge_930C_HD_1113xx_si2165_config') [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:159:2: error: unknown field 'chip_mode' specified in initializer
           .chip_mode = SI2165_MODE_PLL_XTAL,
           ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:159:15: error: 'SI2165_MODE_PLL_XTAL' undeclared here (not in a function)
           .chip_mode = SI2165_MODE_PLL_XTAL,
                        ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:159:2: warning: excess elements in struct initializer [enabled by default]
           .chip_mode = SI2165_MODE_PLL_XTAL,
           ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:159:2: warning: (near initialization for 'hauppauge_930C_HD_1113xx_si2165_config') [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:160:2: error: unknown field 'ref_freq_Hz' specified in initializer
           .ref_freq_Hz = 16000000,
           ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:160:2: warning: excess elements in struct initializer [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:160:2: warning: (near initialization for 'hauppauge_930C_HD_1113xx_si2165_config') [enabled by default]
      >> drivers/media/usb/cx231xx/cx231xx-dvb.c:163:21: error: variable 'pctv_quatro_stick_1114xx_si2165_config' has initializer but incomplete type
          static const struct si2165_config pctv_quatro_stick_1114xx_si2165_config = {
                              ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:164:2: error: unknown field 'i2c_addr' specified in initializer
           .i2c_addr = 0x64,
           ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:164:2: warning: excess elements in struct initializer [enabled by default]
      >> drivers/media/usb/cx231xx/cx231xx-dvb.c:164:2: warning: (near initialization for 'pctv_quatro_stick_1114xx_si2165_config') [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:165:2: error: unknown field 'chip_mode' specified in initializer
           .chip_mode = SI2165_MODE_PLL_EXT,
           ^
      >> drivers/media/usb/cx231xx/cx231xx-dvb.c:165:15: error: 'SI2165_MODE_PLL_EXT' undeclared here (not in a function)
           .chip_mode = SI2165_MODE_PLL_EXT,
                        ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:165:2: warning: excess elements in struct initializer [enabled by default]
           .chip_mode = SI2165_MODE_PLL_EXT,
           ^
      >> drivers/media/usb/cx231xx/cx231xx-dvb.c:165:2: warning: (near initialization for 'pctv_quatro_stick_1114xx_si2165_config') [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c:166:2: error: unknown field 'ref_freq_Hz' specified in initializer
           .ref_freq_Hz = 24000000,
           ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:166:2: warning: excess elements in struct initializer [enabled by default]
      >> drivers/media/usb/cx231xx/cx231xx-dvb.c:166:2: warning: (near initialization for 'pctv_quatro_stick_1114xx_si2165_config') [enabled by default]
         drivers/media/usb/cx231xx/cx231xx-dvb.c: In function 'dvb_init':
         drivers/media/usb/cx231xx/cx231xx-dvb.c:731:3: warning: passing argument 1 of 'si2165_attach' from incompatible pointer type [enabled by default]
            dev->dvb->frontend = dvb_attach(si2165_attach,
            ^
         In file included from drivers/media/usb/cx231xx/cx231xx-dvb.c:35:0:
         drivers/media/dvb-frontends/si2165.h:55:36: note: expected 'const struct si2165_config *' but argument is of type 'const struct si2165_config *'
          static inline struct dvb_frontend *si2165_attach(
                                             ^
         drivers/media/usb/cx231xx/cx231xx-dvb.c:764:3: warning: passing argument 1 of 'si2165_attach' from incompatible pointer type [enabled by default]
            dev->dvb->frontend = dvb_attach(si2165_attach,
            ^
         In file included from drivers/media/usb/cx231xx/cx231xx-dvb.c:35:0:
         drivers/media/dvb-frontends/si2165.h:55:36: note: expected 'const struct si2165_config *' but argument is of type 'const struct si2165_config *'
          static inline struct dvb_frontend *si2165_attach(
                                             ^
      
      That happens because the frontend was disabled by .config, but the
      si2165_attach void stub require those structs, and also the
      drivers that call it.
      
      While here, remove the duplicated info about the possible I2C
      addresses.
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      7f196789
    • H
      [media] solo6x10: fix potential null dereference · 0a128308
      Hans Verkuil 提交于
      drivers/media/pci/solo6x10/solo6x10-disp.c:221 solo_set_motion_block() error: potential null dereference
      'buf'.  (kzalloc returns null)
      
      Also propagate this error up the chain.
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      0a128308
    • H
      [media] v4l2-ctrls: fix rounding calculation · 9c9cb1fa
      Hans Verkuil 提交于
      Commit 958c7c7e ("[media] v4l2-ctrls: fix corner case in round-to-range code") broke
      controls that use a negative range.
      
      The cause was a s32/u32 mixup: ctrl->step is unsigned while all others are signed. So
      the result type of the expression '(ctrl)->maximum - ((ctrl)->step / 2)' became unsigned,
      making 'val >= (ctrl)->maximum - ((ctrl)->step / 2)' true, since '((u32)-128) > 128'
      (if val = -128, maximum = 128 and step = 1).
      
      So carefully cast (step / 2) to s32.
      
      There was one cast of step to s32 where it should have been u32 because both offset and
      step are unsigned, so casting to signed makes no sense there. You do need a cast to u32
      there, because otherwise architectures that have no 64-bit division start complaining
      (step is a u64).
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Reported-by: NFrank Schäfer <fschaefer.oss@googlemail.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      9c9cb1fa
    • M
      [media] mceusb: select default keytable based on vendor · 5b8c8d41
      Mauro Carvalho Chehab 提交于
      Some vendors have their on keymap table that are used on
      all (or almost all) models for that vendor.
      
      So, instead of specifying the keymap table per USB ID,
      let's use the Vendor ID's table by default.
      
      At the end, this will mean less code to be added when newer
      devices for those vendors are added.
      
      Of course, if rc_map is specified per board, it takes
      precedence.
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      5b8c8d41
    • M
      [media] mceusb: add support for newer cx231xx devices · 9683e01e
      Mauro Carvalho Chehab 提交于
      Add support for the si2165-based cx231xx devices:
      	[2013:025e] PCTV QuatroStick 522e
      	[2013:0259] PCTV QuatroStick 521e
      	[2040:b131] Hauppauge WinTV 930C-HD (model 1114xx)
      
      They're similar to the already supported:
      	[2040:b130] Hauppauge WinTV 930C-HD (model 1113xx)
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      9683e01e
    • M
      [media] cx231xx: handle errors at read_eeprom() · 1f97947c
      Mauro Carvalho Chehab 提交于
      Fix the following warnings:
      	drivers/media/usb/cx231xx/cx231xx-cards.c: In function 'read_eeprom':
      	drivers/media/usb/cx231xx/cx231xx-cards.c:979:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      1f97947c
    • M
      [media] cx231xx: Add support for PCTV QuatroStick 522e · 140a7987
      Matthias Schwarzott 提交于
      Add support for:
      	[2013:025e] PCTV QuatroStick 522e
      
      The hardware is identical to Hauppauge WinTV 930C-HD (model 1114xx)
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      140a7987
    • M
      [media] cx231xx: Add support for PCTV QuatroStick 521e · a141a887
      Matthias Schwarzott 提交于
      Add support for:
      	[2013:0259] PCTV QuatroStick 521e
      
      The hardware is identical to Hauppauge WinTV 930C-HD (model 1113xx)
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      a141a887
    • M
      [media] cx231xx: Add digital support for HVR930C-HD model 1114xx · 9e49f7c3
      Matthias Schwarzott 提交于
      Add support for:
      	[2040:b131] Hauppauge WinTV 930C-HD (model 1114xx)
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Tested-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      9e49f7c3
    • M
      [media] cx231xx: Add digital support for HVR 930c-HD model 1113xx · dd2e7dd2
      Matthias Schwarzott 提交于
      Add support for:
      	[2040:b130] Hauppauge WinTV 930C-HD (model 1113xx)
      
      After loading the driver the first open to dvb device node fails.
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      dd2e7dd2
    • M
      [media] cx231xx: prepare for i2c_client attachment · 6d3debaf
      Matthias Schwarzott 提交于
      This is needed to support PCTV QuatroStick 522e which uses a si2157.
      The si2157 driver is written using i2c_client attachment.
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Tested-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      6d3debaf
    • M
      [media] cx23885: Add si2165 support for HVR-5500 · 36efec48
      Matthias Schwarzott 提交于
      The same card entry is used for HVR-4400 and HVR-5500.
      Only HVR-5500 has been tested.
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      36efec48
    • M
      [media] si2165: Add demod driver for DVB-T only · 3e54a169
      Matthias Schwarzott 提交于
      DVB-T was tested  with 8MHz BW channels in germany
      This driver is the simplest possible, it uses automatic mode for all
      parameters (TPS).
      
      Added spectrum inversion support.
      Signed-off-by: NMatthias Schwarzott <zzam@gentoo.org>
      Tested-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      3e54a169