Skip to content
  1. Nov 05, 2011
  2. Nov 04, 2011
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 1046a2c4
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
        [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
        [media] it913x [VER 1.07] Support for single ITE 9135 devices
        [media] Support for Terratec G1
        [media] cx25821: off by one in cx25821_vidioc_s_input()
        [media] media: tea5764: reconcile Kconfig symbol and macro
        [media] omap_vout: Add poll() support
        [media] omap3isp: preview: Add crop support on the sink pad
        [media] omap3isp: preview: Rename min/max input/output sizes defines
        [media] omap3isp: preview: Remove horizontal averager support
        [media] omap3isp: Report the ISP revision through the media controller API
        [media] omap3isp: ccdc: remove redundant operation
        [media] omap3isp: Fix memory leaks in initialization error paths
        [media] omap3isp: Add missing mutex_destroy() calls
        [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
        [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
        [media] MFC: Change MFC firmware binary name
        [media] vb2: add vb2_get_unmapped_area in vb2 core
        [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
        [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
        [media] media: ov6650: stylistic improvements
        ...
      1046a2c4
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 46e85f5f
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (w83627ehf) Add support for the W83627UHG
        hwmon: (w83627ehf) Clean up probe function
        hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types
        hwmon: Use i2c_smbus_{read,write}_word_swapped
        hwmon: (smsc47b397) Fix checkpatch errors
        hwmon: (lm90) Make code more readable
        hwmon: (lm90) Fix warnings
        hwmon: (ibmaem) Avoid repeated memory allocations
        hwmon: (ibmaem) Make instance initializations independent
        hwmon: (ibmaem) Fix error paths
        hwmon: (lm73) Make detection less problematic
        hwmon: Avoid building drivers for powerpc that read/write ISA addresses
      46e85f5f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b2409fb6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
        ALSA: hda/realtek - Skip invalid digital out pins
        ALSA: hda/sigmatel - Automatically retrieve digital I/O widgets
        ALSA: hda - Remove unused variables
        ALSA: hda/realtek - Don't create alt-stream for capture when unnecessary
        ALSA: hda - Add support for 92HD65 / 92HD66 family of codecs
        ALSA: hda - Disable power-widget control for IDT 92HD83/93 as default
        ALSA: hda - Check NO_PRESENCE pincfg default bit
        ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
        ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
        ASoC: Ensure WM8962 PLL registers are reset
        ALSA: intel8x0 - Fix inclusion of kvm_para.h
        ALSA: hda_hwdep: Fix possible buffer overflow
        ASoC: Fix return value of wm5100_gpio_direction_out()
        ASoC: WM8904: Set `invert' bit for Capture Switch
        ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt
        ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
        ALSA: intel8x0: Improve performance in virtual environment
        ALSA: hdspm - Enable all firmware ranges for PCI MADI/AES cards
        ALSA: hdsp - Correct HDSP_VERSION_BIT constant, thus partly fixing RPM detection
        ALSA: hdspm - Fix MADI channel format in the status ioctl
        ...
      b2409fb6
    • Linus Torvalds's avatar
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · 6b1506c6
      Linus Torvalds authored
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        dt: add empty of_machine_is_compatible
        ahci: add DT binding for Calxeda AHCI controller
        dt/platform: minor cleanup
        dt: add empty of_alias_get_id() for non-dt builds
      6b1506c6
    • Jeff Layton's avatar
      nfs: set vs_hidden on nfs4_callback_version4 (try #2) · 6070295e
      Jeff Layton authored
      
      
      This service should not be registered with or unregistered from rpcbind.
      
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      6070295e
    • Jean Delvare's avatar
      hwmon: (w83627ehf) Add support for the W83627UHG · eff7687d
      Jean Delvare authored
      
      
      This is essentially a stripped down version of the W83627DHG. Noticeable
      difference is that it is still powered with +5V, as older models, even
      though the ADC resolution is 8 mV as newer models have.
      
      Thanks to Ulf Bruman (Saab Group) for doing all the testing.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      eff7687d
    • Jean Delvare's avatar
      hwmon: (w83627ehf) Clean up probe function · 6ba71de5
      Jean Delvare authored
      
      
      The probe function has grown pretty large, I think it's time for some
      cleanups, starting with these two simple ones:
      * Move temp3/in6 check for the W83667HG later in the function, where
        it is done for all other chip types.
      * Move temperature register setting to a separate function, to avoid
        code duplication.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      6ba71de5
    • Jean Delvare's avatar
      hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types · 2265cef2
      Jean Delvare authored
      
      
      When temperature sources are PECI or AMD-SI agents, it makes no sense
      to report their type as diode or thermistor. Instead we must report
      their digital nature.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: stable@kernel.org
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      2265cef2
    • Jean Delvare's avatar
      hwmon: Use i2c_smbus_{read,write}_word_swapped · 90f4102c
      Jean Delvare authored
      
      
      Make use of the new i2c_smbus_{read,write}_word_swapped functions.
      This makes the driver code more compact and readable. It also ensures
      proper error handling.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: Dirk Eibach <eibach@gdsys.de>
      Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
      Cc: Guillaume Ligneul <guillaume.ligneul@gmail.com>
      90f4102c
    • Jean Delvare's avatar
    • Jean Delvare's avatar
      hwmon: (lm90) Make code more readable · b2589ab0
      Jean Delvare authored
      
      
      Clean up the code to make it more readable:
      * Remove reg_ and new_ prefixes from variable names, they made the
        names longer, causing extra line breaks, while not adding much
        value.
      * Introduce struct device dev* = &client->dev in two functions, to
        avoid repeating client->dev everywhere in these functions.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      b2589ab0
    • Jean Delvare's avatar
      hwmon: (lm90) Fix warnings · 8dc089d6
      Jean Delvare authored
      
      
      With some configuration option combinations, we get the following
      warnings:
      
      drivers/hwmon/lm90.c: In function 'lm90_detect':
      drivers/hwmon/lm90.c:1114: warning: 'chip_id' may be used uninitialized
      in this function
      drivers/hwmon/lm90.c:1114: warning: 'reg_config1' may be used
      uninitialized in this function
      drivers/hwmon/lm90.c:1114: warning: 'reg_convrate' may be used
      uninitialized in this function
      drivers/hwmon/lm90.c:1187: warning: 'reg_emerg2' may be used
      uninitialized in this function
      drivers/hwmon/lm90.c:1187: warning: 'reg_status2' may be used
      uninitialized in this function
      
      We can solve these easily by reading the register values first and
      checking for errors later. These errors should be very rare, even in
      the case of failed detection, so this change has no impact on
      performance. And this makes checkpatch.pl happier.
      
      Reported-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      8dc089d6
    • Jean Delvare's avatar
      hwmon: (ibmaem) Avoid repeated memory allocations · da8ebe4e
      Jean Delvare authored
      
      
      Preallocate a buffer for the response to sensor reads, and reuse it
      for each read instead of allocating a new one each time. This should
      be faster and should also avoid memory fragmentation.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
      Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      da8ebe4e