1. 08 11月, 2011 1 次提交
    • A
      ARM: OMAP: omap_device: Include linux/export.h · 55581415
      Axel Lin 提交于
      Include linux/export.h to fix below build warning:
      
        CC      arch/arm/plat-omap/omap_device.o
      arch/arm/plat-omap/omap_device.c:1055: warning: data definition has no type or storage class
      arch/arm/plat-omap/omap_device.c:1055: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
      arch/arm/plat-omap/omap_device.c:1055: warning: parameter names (without types) in function declaration
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      55581415
  2. 07 11月, 2011 21 次提交
  3. 06 11月, 2011 18 次提交
    • T
      ALSA: hda - Revert the check of NO_PRESENCE pincfg default bit · f4419172
      Takashi Iwai 提交于
      The implementation on commit [08a1f5eb: ALSA: hda - Check NO_PRESENCE
      pincfg default bit] seems like a mis-interpretation of specification.
      The spec gives the reversed bit definition.  But, following the spec
      also causes to change so many existing device configurations, thus we
      can't change it so easily for now.  For 3.2-rc1, it's safer to revert
      this check (actually this patch comments out the code).
      
      We may re-introduced the fixed version once after the wider test-case
      coverages are done.
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      f4419172
    • T
      ALSA: hda - Fix a regression for DMA-position check with CA0110 · 69f9ba9b
      Takashi Iwai 提交于
      The regression-fix in 3.1 for the check of DMA-position validity caused
      yet another regression for CA0110.  As usual, this hardware seems working
      only with LPIB properly.  Adding the appropriate driver-caps bit to force
      LPIB fixes the problem.
      Reported-and-tested-by: NAndres Freund <andres@anarazel.de>
      Cc: <stable@kernel.org> [v3.1]
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      69f9ba9b
    • T
      ALSA: hda - Fix silent output regression with ALC861 · 43dea228
      Takashi Iwai 提交于
      The 3.1 kernel has a regression for ALC861 codec where no sound output
      is heard with the default setup.  It's because the amps in DACs aren't
      properly unmuted while the output mixers are assigned only to pins.
      
      This patch fixes the missing initialization of DACs when no mixer is
      assigned to them.
      Tested-by: NAndrea Iob <andrea_iob@yahoo.it>
      Cc: <stable@kernel.org> [v3.1+]
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      43dea228
    • O
      ALSA: control: remove compilation warning on 32-bit · 447c6f93
      Olof Johansson 提交于
      This was introduced by 'ALSA: control: add support for ENUMERATED user
      space controls' which adds a u64 variable that gets cast to a pointer:
      
      sound/core/control.c: In function 'snd_ctl_elem_init_enum_names':
      sound/core/control.c:1089: warning: cast to pointer from integer of different size
      
      Cast to uintptr_t before casting to pointer to avoid the warning.
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      [cl: replace long with uintptr_t]
      Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      447c6f93
    • C
      ALSA: ua101: fix crash when unplugging · 862a6244
      Clemens Ladisch 提交于
      If the device is unplugged while running, it is possible for a PCM
      device to be closed after the disconnect callback has returned.  This
      means that kill_stream_urb() and disable_iso_interface() would try to
      access already-invalid or freed USB data structures.
      
      The function free_usb_related_resources() was intended to prevent this,
      but forgot to clear the affected variables.
      Reported-and-tested-by: NOlivier Courtay <olivier@courtay.org>
      Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
      Cc: 2.6.33+ <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      862a6244
    • K
      ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos · 83014579
      Kukjin Kim 提交于
      The arch/arm/mach-exynos4 directory (CONFIG_ARCH_EXYNOS4) has
      made for plaforms based on EXYNOS4 SoCs. But since upcoming
      Samsung's SoCs such as EXYNOS5 (ARM Cortex A15) can reuse most
      codes in current mach-exynos4, one mach-exynos directory will
      be used for them.
      
      This patch changes to CONFIG_ARCH_EXYNOS (arch/arm/mach-exynos)
      but keeps original CONFIG_ARCH_EXYNOS4 in mach-exynos/Kconfig to
      avoid changing in driver side.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      83014579
    • M
      ARM: EXYNOS4: convert MCT to percpu interrupt API · e700e41d
      Marc Zyngier 提交于
      MCT recently gained per cpu interrupts, and missed the fact that
      ARM has moved to a genirq based implementation.
      
      This patch converts the driver to the new API.
      
      Boot tested on Origen.
      
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      e700e41d
    • J
      ARM: SAMSUNG: Add clk enable/disable of pwm · d8633c1d
      Joonyoung Shim 提交于
      PWM timers use pclk("timers" clk) as parent clk. If this pclk is the
      disabled state when PWM driver is probed, then it causes wrong read and
      write operation about registers of PWM.
      Signed-off-by: NJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      d8633c1d
    • J
      ARM: SAMSUNG: Fix compile error due to kfree · 8088041e
      Jonghwan Choi 提交于
      Fix following build error.
      arch/arm/plat-samsung/dev-backlight.c: In function 'samsung_bl_set':
      arch/arm/plat-samsung/dev-backlight.c:145: error: implicit declaration of function 'kfree'
      Signed-off-by: NJonghwan Choi <jhbird.choi@gmail.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      8088041e
    • H
      ceph/super.c: quiet sparse noise · 0c6d4b4e
      H Hartley Sweeten 提交于
      Quiet the sparse noise:
      
      warning: symbol 'create_fs_client' was not declared. Should it be static?
      warning: symbol 'destroy_fs_client' was not declared. Should it be static?
      Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
      Cc: Sage Weil <sage@newdream.net>
      ceph-devel@vger.kernel.org
      Signed-off-by: NSage Weil <sage@newdream.net>
      0c6d4b4e
    • H
      ceph/mds_client.c: quiet sparse noise · 7fd7d101
      H Hartley Sweeten 提交于
      Quiet the following sparse noise:
      
      warning: symbol 'get_nonsnap_parent' was not declared. Should it be static?
      warning: symbol 'done_closing_sessions' was not declared. Should it be static?
      
      Local functions don't need external visability. Make them static.
      Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
      Cc: Sage Weil <sage@newdream.net>
      Signed-off-by: NSage Weil <sage@newdream.net>
      7fd7d101
    • S
      ceph: use new D_COMPLETE dentry flag · c6ffe100
      Sage Weil 提交于
      We used to use a flag on the directory inode to track whether the dcache
      contents for a directory were a complete cached copy.  Switch to a dentry
      flag CEPH_D_COMPLETE that is safely updated by ->d_prune().
      Signed-off-by: NSage Weil <sage@newdream.net>
      c6ffe100
    • L
      Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc · c861cd3e
      Linus Torvalds 提交于
      * 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc: (30 commits)
        ARM: mmp: register internal sram bank
        ARM: mmp: register audio sram bank
        ARM: mmp: add sram allocator
        gpio/samsung: Complain loudly if we don't know the SoC
        ARM: S3C64XX: Fix SoC identification for S3C64xx devices
        ARM: S3C2443: Remove redundant s3c_register_clocks call for init_clocks
        ARM: S3C24XX: Add devname for hsmmc1 pclk
        ARM: S3C24XX: use clk_get_rate to init fclk in common_setup_clocks
        ARM: S3C2443: Accommodate cpufreq frequency scheme in armdiv
        ARM: S3C2443: handle unset armdiv values gracefully
        ARM: S3C2443: Add get_rate operation for clk_armdiv
        ARM: S3C2416: Add comment describing the armdiv/armclk
        ARM: S3C2443: Move clk_arm and clk_armdiv to common code
        ARM: S3C24XX: Add infrastructure to transmit armdiv to common code
        ARM: S3C2416: Add armdiv_mask constant
        ARM: EXYNOS4: Add support for M-5MOLS camera on Nuri board
        ARM: EXYNOS4: Enable MFC on ORIGEN
        ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450
        ARM: SAMSUNG: Add support s3c2443-adc for S3C2443
        ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX
        ...
      c861cd3e
    • L
      Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc · 7abec10c
      Linus Torvalds 提交于
      * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
        ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
        ARM: SAMSUNG: Cleanup resources by using macro
        ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
        ARM: S5P: To merge devs.c files to one devs.c
        ARM: S3C64XX: To merge devs.c files to one devs.c
        ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
        ARM: S5P64X0: Add Power Management support
        ARM: S5P: Make the sleep code common for S5P series SoCs
        ARM: S5P: Make the common S5P PM code conditionally compile
        ARM: SAMSUNG: Move S5P header files to plat-samsung
        ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
        ARM: SAMSUNG: Moving each SoC support header files
        ARM: SAMSUNG: Consolidate plat/pll.h
        ARM: SAMSUNG: Consolidate plat/pwm-clock.h
        ARM: SAMSUNG: Cleanup mach/clkdev.h
        ARM: SAMSUNG: remove sdhci default configuration setup platform helper
        ARM: EXYNOS4: Add FIMC device on SMDKV310 board
        ARM: EXYNOS4: Add header file protection macros
        ARM: EXYNOS4: Add usb ehci device to the SMDKV310
        ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
        ...
      
      Fix up conflicts in
       - arch/arm/mach-exynos4/{Kconfig,clock.c}
      	ARM_CPU_SUSPEND, various random device tables (gah!)
       - drivers/gpio/Makefile
      	sa1100 gpio added, samsung gpio drivers merged
      7abec10c
    • T
      MAINTAINERS: Update eCryptfs maintainer address · 0de9adf2
      Tyler Hicks 提交于
      Update my email address in MAINTAINERS.
      Signed-off-by: NTyler Hicks <tyhicks@canonical.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0de9adf2
    • L
      Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8110efc6
      Linus Torvalds 提交于
      * 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / Freezer: Revert 27920651 "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too"
        PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count
        USB: Update last_busy time after autosuspend fails
        PM / Runtime: Automatically retry failed autosuspends
        PM / QoS: Remove redundant check
        PM / OPP: Fix build when CONFIG_PM_OPP is not set
        PM / Runtime: Fix runtime accounting calculation error
        PM / Sleep: Update freezer documentation
        PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug'
        PM / Sleep: Fix race between CPU hotplug and freezer
        ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist
      8110efc6
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 06d8eb1b
      Linus Torvalds 提交于
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: Convert wm831x driver to watchdog core
        watchdog: s3c2410: convert to use the watchdog framework
        Documentation: watchdog: add guide how to convert drivers to new framework
        watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing
        watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver
        watchdog: irq: Remove IRQF_DISABLED
        watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD
        watchdog: sc520_wdt: Remove unnecessary cast.
      06d8eb1b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · cd3f07d1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)
        [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev
        [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands
        [SCSI] scsi_transport_iscsi: Fix documentation os parameter
        [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support
        [SCSI] libfc: improve flogi retries to avoid lport stuck
        [SCSI] libfc: avoid exchanges collision during lport reset
        [SCSI] libfc: fix checking FC_TYPE_BLS
        [SCSI] edd: Treat "XPRS" host bus type the same as "PCI"
        [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)
        [SCSI] isci: revert bcn filtering
        [SCSI] isci: Fix hard reset timeout conditions.
        [SCSI] isci: No need to manage the pending reset bit on pending requests.
        [SCSI] isci: Remove redundant isci_request.ttype field.
        [SCSI] isci: Fix task management for SMP, SATA and on dev remove.
        [SCSI] isci: No task_done callbacks in error handler paths.
        [SCSI] isci: Handle task request timeouts correctly.
        [SCSI] isci: Fix tag leak in tasks and terminated requests.
        [SCSI] isci: Immediately fail I/O to removed devices.
        [SCSI] isci: Lookup device references through requests in completions.
        [SCSI] ipr: add definitions for additional adapter
        ...
      cd3f07d1