Linux 3.13.4
Greg KH
maintainerI'm announcing the release of the 3.13.4 kernel.
All users of the 3.13 kernel series must upgrade.
The updated 3.13.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.13.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/mach-imx/clk-imx6q.c | 3 arch/arm/mach-imx/clk-imx6sl.c | 3 arch/arm/mach-imx/pm-imx6q.c | 2 arch/arm64/include/asm/atomic.h | 29 +++++-- arch/arm64/include/asm/cacheflush.h | 1 arch/arm64/include/asm/cmpxchg.h | 9 +- arch/arm64/include/asm/futex.h | 6 + arch/arm64/kernel/kuser32.S | 6 + arch/arm64/kernel/vdso.c | 4 - arch/arm64/kernel/vdso/Makefile | 2 arch/arm64/kernel/vdso/gettimeofday.S | 7 + arch/arm64/lib/bitops.S | 3 arch/arm64/mm/mmu.c | 12 ++- arch/s390/crypto/aes_s390.c | 65 ++++++++++++----- arch/s390/crypto/des_s390.c | 95 ++++++++++++++++---------- arch/x86/kernel/cpu/intel.c | 2 drivers/irqchip/irq-armada-370-xp.c | 4 - drivers/md/bcache/bcache.h | 4 - drivers/md/bcache/btree.c | 2 drivers/media/dvb-frontends/cx24117.c | 2 drivers/media/usb/dvb-usb-v2/af9035.c | 2 drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 2 drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 drivers/media/v4l2-core/videobuf-dma-contig.c | 12 +-- drivers/media/v4l2-core/videobuf-dma-sg.c | 10 +- drivers/media/v4l2-core/videobuf-vmalloc.c | 10 +- drivers/pinctrl/core.c | 2 drivers/pinctrl/pinctrl-at91.c | 10 +- drivers/pinctrl/pinctrl-imx1-core.c | 10 +- drivers/pinctrl/vt8500/pinctrl-wmt.c | 15 +++- drivers/regulator/core.c | 9 ++ fs/btrfs/inode.c | 2 fs/buffer.c | 6 + fs/nfs/nfs4client.c | 2 fs/nfs/nfs4proc.c | 8 +- fs/nfs/nfs4session.c | 25 +++++- fs/nfs/nfs4session.h | 2 include/linux/nfs_xdr.h | 2 kernel/irq/Kconfig | 1 lib/Makefile | 1 mm/page-writeback.c | 5 - mm/swapfile.c | 11 ++- security/selinux/ss/services.c | 4 + sound/pci/hda/patch_analog.c | 27 +++++++ sound/pci/hda/patch_realtek.c | 9 ++ sound/usb/Kconfig | 1 47 files changed, 317 insertions(+), 136 deletions(-)
Andi Shyti (1):
cx24117: use a valid dev pointer for dev_err printout
Antti Palosaari (1):
af9035: add ID [2040:f900] Hauppauge WinTV-MiniStick 2
Catalin Marinas (1):
arm64: Invalidate the TLB when replacing pmd entries during boot
Chris Ruehl (2):
pinctrl: imx27: fix wrong offset to ICONFB
pinctrl: imx27: fix offset calculation in imx_read_2bit
Darrick J. Wong (1):
bcache: fix BUG_ON due to integer overflow with GC_SECTORS_USED
Dave Jones (2):
mxl111sf: Fix unintentional garbage stack read
mxl111sf: Fix compile when CONFIG_DVB_USB_MXL111SF is unset
Greg Kroah-Hartman (1):
Linux 3.13.4
Hans Verkuil (1):
Revert "[media] videobuf_vm_{open,close} race fixes"
Harald Freudenberger (3):
crypto: s390 - fix concurrency issue in aes-ctr mode
crypto: s390 - fix des and des3_ede cbc concurrency issue
crypto: s390 - fix des and des3_ede ctr concurrency issue
Josef Bacik (1):
Btrfs: disable snapshot aware defrag for now
KOSAKI Motohiro (2):
mm: __set_page_dirty_nobuffers() uses spin_lock_irqsave() instead of spin_lock_irq()
mm: __set_page_dirty uses spin_lock_irqsave instead of spin_lock_irq
Lior Amsalem (2):
irqchip: armada-370-xp: fix IPI race condition
irqchip: armada-370-xp: fix MSI race condition
Mark Brown (1):
regulator: core: Correct default return value for full constraints
Mel Gorman (1):
x86: mm: change tlb_flushall_shift for IvyBridge
Nathan Lynch (2):
arm64: vdso: update wtm fields for CLOCK_MONOTONIC_COARSE
arm64: vdso: fix coarse clock handling
Nicolas Ferre (1):
pinctrl: at91: use locked variant of irq_set_handler
Nitin A Kamble (1):
genirq: Generic irq chip requires IRQ_DOMAIN
Peter Oberparleiter (1):
x86, hweight: Fix BUG when booting with CONFIG_GCOV_PROFILE_ALL=y
Philipp Zabel (1):
ARM: imx6: Initialize low-power mode early again
Stanislaw Gruszka (1):
pinctrl: protect pinctrl_list add
Stephen Smalley (1):
SELinux: Fix kernel BUG on empty security contexts.
Takashi Iwai (5):
ALSA: usb-audio: Add missing kconfig dependecy
ALSA: hda - Fix missing VREF setup for Mac Pro 1,1
ALSA: hda - Fix silent output on Toshiba Satellite L40
ALSA: hda - Add missing mixer widget for AD1983
ALSA: hda - Improve loopback path lookups for AD1983
Tony Prisk (1):
pinctrl: vt8500: Change devicetree data parsing
Trond Myklebust (2):
NFSv4.1: nfs4_destroy_session must call rpc_destroy_waitqueue
NFSv4: Fix memory corruption in nfs4_proc_open_confirm
Vinayak Kale (1):
arm64: add DSB after icache flush in __flush_icache_all()
Weijie Yang (1):
mm/swap: fix race on swap_info reuse between swapoff and swapon
Will Deacon (2):
arm64: atomics: fix use of acquire + release for full barrier semantics
arm64: vdso: prevent ld from aligning PT_LOAD segments to 64k
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 13 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = One Giant Leap for Frogkind
arch/arm/mach-imx/clk-imx6q.c +3 -0
@@ -479,6 +479,9 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)if (IS_ENABLED (CONFIG_PCI_IMX6 ))clk_set_parent (clk[lvds1_sel], clk[sata_ref]); +/* Set initial power mode */ +imx6q_set_lpm (WAIT_CLOCKED ); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx6q-gpt" ); base =of_iomap (np,0 );WARN_ON (!base);
arch/arm/mach-imx/clk-imx6sl.c +3 -0
@@ -261,6 +261,9 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)clk_prepare_enable (clks[IMX6SL_CLK_USBPHY2_GATE ]); } +/* Set initial power mode */ +imx6q_set_lpm (WAIT_CLOCKED ); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx6sl-gpt" ); base =of_iomap (np,0 );WARN_ON (!base);
arch/arm/mach-imx/pm-imx6q.c +0 -2
@@ -228,8 +228,6 @@ void __init imx6q_pm_init(void)regmap_update_bits (gpr,IOMUXC_GPR1 ,IMX6Q_GPR1_GINT ,IMX6Q_GPR1_GINT ); -/* Set initial power mode */ -imx6q_set_lpm (WAIT_CLOCKED );suspend_set_ops (&imx6q_pm_ops); }
arch/arm64/include/asm/atomic.h +20 -9
@@ -64,7 +64,7 @@ static inline int atomic_add_return(int i, atomic_t *v)int result; asmvolatile ("// atomic_add_return\n" -"1: ldaxr %w0, %2\n" +"1: ldxr %w0, %2\n" " add %w0, %w0, %w3\n" " stlxr %w1, %w0, %2\n" " cbnz %w1, 1b"
@@ -72,6 +72,7 @@ static inline int atomic_add_return(int i, atomic_t *v) : "Ir" (i) : "cc", "memory"); +smp_mb ();return result; }
@@ -96,7 +97,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)int result; asmvolatile ("// atomic_sub_return\n" -"1: ldaxr %w0, %2\n" +"1: ldxr %w0, %2\n" " sub %w0, %w0, %w3\n" " stlxr %w1, %w0, %2\n" " cbnz %w1, 1b"
@@ -104,6 +105,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) : "Ir" (i) : "cc", "memory"); +smp_mb ();return result; }
@@ -112,17 +114,20 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)unsigned long tmp;int oldval; +smp_mb (); + asmvolatile ("// atomic_cmpxchg\n" -"1: ldaxr %w1, %2\n" +"1: ldxr %w1, %2\n" " cmp %w1, %w3\n" " b.ne 2f\n" -" stlxr %w0, %w4, %2\n" +" stxr %w0, %w4, %2\n" " cbnz %w0, 1b\n" "2:" :"=&r" (tmp),"=&r" (oldval),"+Q" (ptr->counter) :"Ir" (old),"r" (new) :"cc" ,"memory" ); +smp_mb ();return oldval; }
@@ -183,7 +188,7 @@ static inline long atomic64_add_return(long i, atomic64_t *v)unsigned long tmp; asmvolatile ("// atomic64_add_return\n" -"1: ldaxr %0, %2\n" +"1: ldxr %0, %2\n" " add %0, %0, %3\n" " stlxr %w1, %0, %2\n" " cbnz %w1, 1b"
@@ -191,6 +196,7 @@ static inline long atomic64_add_return(long i, atomic64_t *v) : "Ir" (i) : "cc", "memory"); +smp_mb ();return result; }
@@ -215,7 +221,7 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)unsigned long tmp; asmvolatile ("// atomic64_sub_return\n" -"1: ldaxr %0, %2\n" +"1: ldxr %0, %2\n" " sub %0, %0, %3\n" " stlxr %w1, %0, %2\n" " cbnz %w1, 1b"
@@ -223,6 +229,7 @@ static inline long atomic64_sub_return(long i, atomic64_t *v) : "Ir" (i) : "cc", "memory"); +smp_mb ();return result; }
@@ -231,17 +238,20 @@ static inline long atomic64_cmpxchg(atomic64_t *ptr, long old, long new)long oldval;unsigned long res; +smp_mb (); + asmvolatile ("// atomic64_cmpxchg\n" -"1: ldaxr %1, %2\n" +"1: ldxr %1, %2\n" " cmp %1, %3\n" " b.ne 2f\n" -" stlxr %w0, %4, %2\n" +" stxr %w0, %4, %2\n" " cbnz %w0, 1b\n" "2:" :"=&r" (res),"=&r" (oldval),"+Q" (ptr->counter) :"Ir" (old),"r" (new) :"cc" ,"memory" ); +smp_mb ();return oldval; }
@@ -253,11 +263,12 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)unsigned long tmp; asmvolatile ("// atomic64_dec_if_positive\n" -"1: ldaxr %0, %2\n" +"1: ldxr %0, %2\n" " subs %0, %0, #1\n" " b.mi 2f\n" " stlxr %w1, %0, %2\n" " cbnz %w1, 1b\n" +" dmb ish\n" "2:" :"=&r" (result),"=&r" (tmp),"+Q" (v->counter) :
arch/arm64/include/asm/cacheflush.h +1 -0
@@ -116,6 +116,7 @@ extern void flush_dcache_page(struct page *);static inline void __flush_icache_all (void ) { asm("ic ialluis" ); +dsb (); }#define flush_dcache_mmap_lock (mapping) \
arch/arm64/include/asm/cmpxchg.h +5 -4
@@ -29,7 +29,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int sizeswitch (size) {case 1 : asmvolatile ("// __xchg1\n" -"1: ldaxrb %w0, %2\n" +"1: ldxrb %w0, %2\n" " stlxrb %w1, %w3, %2\n" " cbnz %w1, 1b\n" : "=&r" (ret), "=&r" (tmp), "+Q" (*(u8 *)ptr)
@@ -38,7 +38,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int sizebreak ;case 2 : asmvolatile ("// __xchg2\n" -"1: ldaxrh %w0, %2\n" +"1: ldxrh %w0, %2\n" " stlxrh %w1, %w3, %2\n" " cbnz %w1, 1b\n" : "=&r" (ret), "=&r" (tmp), "+Q" (*(u16 *)ptr)
@@ -47,7 +47,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int sizebreak ;case 4 : asmvolatile ("// __xchg4\n" -"1: ldaxr %w0, %2\n" +"1: ldxr %w0, %2\n" " stlxr %w1, %w3, %2\n" " cbnz %w1, 1b\n" : "=&r" (ret), "=&r" (tmp), "+Q" (*(u32 *)ptr)
@@ -56,7 +56,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int sizebreak ;case 8 : asmvolatile ("// __xchg8\n" -"1: ldaxr %0, %2\n" +"1: ldxr %0, %2\n" " stlxr %w1, %3, %2\n" " cbnz %w1, 1b\n" : "=&r" (ret), "=&r" (tmp), "+Q" (*(u64 *)ptr)
@@ -67,6 +67,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int sizeBUILD_BUG (); } +smp_mb ();return ret; }
arch/arm64/include/asm/futex.h +4 -2
@@ -24,10 +24,11 @@#define __futex_atomic_op (insn, ret, oldval, uaddr, tmp, oparg) \ asm volatile( \ -"1: ldaxr %w1, %2\n" \ +"1: ldxr %w1, %2\n" \ insn "\n" \ "2: stlxr %w3, %w0, %2\n" \ " cbnz %w3, 1b\n" \ +" dmb ish\n" \ "3:\n" \ " .pushsection .fixup,\"ax\"\n" \ "4: mov %w0, %w5\n" \
@@ -110,11 +111,12 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,return -EFAULT ; asmvolatile ("// futex_atomic_cmpxchg_inatomic\n" -"1: ldaxr %w1, %2\n" +"1: ldxr %w1, %2\n" " sub %w3, %w1, %w4\n" " cbnz %w3, 3f\n" "2: stlxr %w3, %w5, %2\n" " cbnz %w3, 1b\n" +" dmb ish\n" "3:\n" " .pushsection .fixup,\"ax\"\n" "4: mov %w0, %w6\n"
arch/arm64/kernel/kuser32.S +4 -2
@@ -38,12 +38,13 @@ __kuser_cmpxchg64: // 0xffff0f60 .inst 0xe92d00f0 // push {r4, r5, r6, r7} .inst 0xe1c040d0 // ldrd r4, r5, [r0] .inst 0xe1c160d0 // ldrd r6, r7, [r1] - .inst 0xe1b20e9f // 1: ldaexd r0, r1, [r2] + .inst 0xe1b20f9f // 1: ldrexd r0, r1, [r2] .inst 0xe0303004 // eors r3, r0, r4 .inst 0x00313005 // eoreqs r3, r1, r5 .inst 0x01a23e96 // stlexdeq r3, r6, [r2] .inst 0x03330001 // teqeq r3, #1 .inst 0x0afffff9 // beq 1b + .inst 0xf57ff05b // dmb ish .inst 0xe2730000 // rsbs r0, r3, #0 .inst 0xe8bd00f0 // pop {r4, r5, r6, r7} .inst 0xe12fff1e // bx lr
@@ -55,11 +56,12 @@ __kuser_memory_barrier: // 0xffff0fa0 .align 5 __kuser_cmpxchg: // 0xffff0fc0 - .inst 0xe1923e9f // 1: ldaex r3, [r2] + .inst 0xe1923f9f // 1: ldrex r3, [r2] .inst 0xe0533000 // subs r3, r3, r0 .inst 0x01823e91 // stlexeq r3, r1, [r2] .inst 0x03330001 // teqeq r3, #1 .inst 0x0afffffa // beq 1b + .inst 0xf57ff05b // dmb ish .inst 0xe2730000 // rsbs r0, r3, #0 .inst 0xe12fff1e // bx lr
arch/arm64/kernel/vdso.c +2 -2
@@ -238,6 +238,8 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->use_syscall = use_syscall; vdso_data->xtime_coarse_sec = xtime_coarse.tv_sec; vdso_data->xtime_coarse_nsec = xtime_coarse.tv_nsec; + vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec; + vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec;if (!use_syscall) { vdso_data->cs_cycle_last = tk->clock->cycle_last;
@@ -245,8 +247,6 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->xtime_clock_nsec = tk->xtime_nsec; vdso_data->cs_mult = tk->mult; vdso_data->cs_shift = tk->shift; - vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec; - vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec; }smp_wmb ();
arch/arm64/kernel/vdso/Makefile +1 -1
@@ -48,7 +48,7 @@ $(obj-vdso): %.o: %.S # Actual build commands quiet_cmd_vdsold = VDSOL $@ - cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ quiet_cmd_vdsoas = VDSOA $@ cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
arch/arm64/kernel/vdso/gettimeofday.S +6 -1
@@ -103,6 +103,8 @@ ENTRY(__kernel_clock_gettime) bl __do_get_tspec seqcnt_check w9, 1b + mov x30, x2 + cmp w0, #CLOCK_MONOTONIC b.ne 6f
@@ -118,6 +120,9 @@ ENTRY(__kernel_clock_gettime) ccmp w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne b.ne 8f + /* xtime_coarse_nsec is already right-shifted */ + mov x12, #0 + /* Get coarse timespec. */ adr vdso_data, _vdso_data 3: seqcnt_acquire
@@ -156,7 +161,7 @@ ENTRY(__kernel_clock_gettime) lsr x11, x11, x12 stp x10, x11, [x1, #TSPEC_TV_SEC] mov x0, xzr - ret x2 + ret 7: mov x30, x2 8: /* Syscall fallback. */
arch/arm64/lib/bitops.S +2 -1
@@ -46,11 +46,12 @@ ENTRY( \name ) mov x2, #1 add x1, x1, x0, lsr #3 // Get word offset lsl x4, x2, x3 // Create mask -1: ldaxr x2, [x1] +1: ldxr x2, [x1] lsr x0, x2, x3 // Save old value of bit \instr x2, x2, x4 // toggle bit stlxr w5, x2, [x1] cbnz w5, 1b + dmb ish and x0, x0, #1 3: ret ENDPROC(\name )
arch/arm64/mm/mmu.c +10 -2
@@ -203,10 +203,18 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,do { next =pmd_addr_end (addr, end);/* try section mapping first */ -if (((addr | next | phys) & ~SECTION_MASK ) ==0 ) +if (((addr | next | phys) & ~SECTION_MASK ) ==0 ) { +pmd_t old_pmd =*pmd;set_pmd (pmd,__pmd (phys | prot_sect_kernel)); -else +/* +* Check for previous table entries created during +* boot (__create_page_tables) and flush them. +*/ +if (!pmd_none (old_pmd)) +flush_tlb_all (); + }else {alloc_init_pte (pmd, addr, next,__phys_to_pfn (phys)); + } phys += next - addr; }while (pmd++, addr = next, addr != end); }
arch/s390/crypto/aes_s390.c +46 -19
115 lines not on this page · raw message
arch/s390/crypto/des_s390.c +62 -33
195 lines not on this page · raw message
arch/x86/kernel/cpu/intel.c +1 -1
@@ -628,7 +628,7 @@ static void intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c) tlb_flushall_shift =5 ;break ;case 0x63a :/* Ivybridge */ - tlb_flushall_shift =1 ; + tlb_flushall_shift =2 ;break ;default : tlb_flushall_shift =6 ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -381,7 +381,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) &PCI_MSI_DOORBELL_MASK ; -writel (~PCI_MSI_DOORBELL_MASK , per_cpu_int_base + +writel (~msimask, per_cpu_int_base +ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS ); for (msinr = PCI_MSI_DOORBELL_START;
@@ -407,7 +407,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) &IPI_DOORBELL_MASK ; -writel (~IPI_DOORBELL_MASK , per_cpu_int_base + +writel (~ipimask, per_cpu_int_base +ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS );/* Handle all pending doorbells */
drivers/md/bcache/bcache.h +3 -1
@@ -209,7 +209,9 @@ BITMASK(GC_MARK, struct bucket, gc_mark, 0, 2);#define GC_MARK_RECLAIMABLE 0#define GC_MARK_DIRTY 1#define GC_MARK_METADATA 2 -BITMASK(GC_SECTORS_USED, struct bucket, gc_mark, 2, 13); +#define GC_SECTORS_USED_SIZE 13 +#define MAX_GC_SECTORS_USED (~(~0ULL << GC_SECTORS_USED_SIZE)) +BITMASK(GC_SECTORS_USED, struct bucket, gc_mark, 2, GC_SECTORS_USED_SIZE); BITMASK(GC_MOVE, struct bucket, gc_mark, 15, 1);#include "journal.h"
drivers/md/bcache/btree.c +1 -1
@@ -1163,7 +1163,7 @@ uint8_t __bch_btree_mark_key(struct cache_set *c, int level, struct bkey *k)/* guard against overflow */ SET_GC_SECTORS_USED (g,min_t (unsigned,GC_SECTORS_USED (g) +KEY_SIZE (k), - (1 <<14 ) -1 )); +MAX_GC_SECTORS_USED ));BUG_ON (!GC_SECTORS_USED (g)); }
drivers/media/dvb-frontends/cx24117.c +1 -1
@@ -1166,7 +1166,7 @@ struct dvb_frontend *cx24117_attach(const struct cx24117_config *config,switch (demod) {case 0 : -dev_err (&state->priv->i2c->dev, +dev_err (&i2c->dev,"%s: Error attaching frontend %d\n" ,KBUILD_MODNAME , demod); goto error1;
drivers/media/usb/dvb-usb-v2/af9035.c +2 -0
@@ -1539,6 +1539,8 @@ static const struct usb_device_id af9035_id_table[] = { &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) }, {DVB_USB_DEVICE (USB_VID_LEADTEK ,0x6a05 , &af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) }, + { DVB_USB_DEVICE(USB_VID_HAUPPAUGE, 0xf900, + &af9035_props, "Hauppauge WinTV-MiniStick 2", NULL) }, { } };MODULE_DEVICE_TABLE (usb, af9035_id_table);
drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h +1 -1
@@ -68,7 +68,7 @@ struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,#else static inline struct dvb_frontend *mxl111sf_tuner_attach (struct dvb_frontend *fe, - struct mxl111sf_state *mxl_state +struct mxl111sf_state *mxl_state,struct mxl111sf_tuner_config *cfg) {printk (KERN_WARNING "%s: driver disabled by Kconfig\n" , __func__);
drivers/media/usb/dvb-usb-v2/mxl111sf.c +1 -1
@@ -105,7 +105,7 @@ int mxl111sf_read_reg(struct mxl111sf_state *state, u8 addr, u8 *data) ret = -EINVAL ; } -pr_debug ("R: (0x%02x, 0x%02x)\n" , addr, *data); +pr_debug ("R: (0x%02x, 0x%02x)\n" , addr, buf[1 ]); fail:return ret; }
drivers/media/v4l2-core/videobuf-dma-contig.c +5 -7
@@ -66,14 +66,11 @@ static void __videobuf_dc_free(struct device *dev,static void videobuf_vm_open (struct vm_area_struct *vma) {struct videobuf_mapping *map = vma->vm_private_data; -struct videobuf_queue *q = map->q; -dev_dbg (q->dev,"vm_open %p [count=%u,vma=%08lx-%08lx]\n" , +dev_dbg (map->q->dev,"vm_open %p [count=%u,vma=%08lx-%08lx]\n" , map, map->count, vma->vm_start, vma->vm_end); -videobuf_queue_lock (q); map->count++; -videobuf_queue_unlock (q); }static void videobuf_vm_close (struct vm_area_struct *vma)
@@ -85,11 +82,12 @@ static void videobuf_vm_close(struct vm_area_struct *vma)dev_dbg (q->dev,"vm_close %p [count=%u,vma=%08lx-%08lx]\n" , map, map->count, vma->vm_start, vma->vm_end); -videobuf_queue_lock (q); -if (!--map->count) { + map->count--; +if (0 == map->count) {struct videobuf_dma_contig_memory *mem;dev_dbg (q->dev,"munmap %p q=%p\n" , map, q); +videobuf_queue_lock (q);/* We need first to cancel streams, before unmapping */ if (q->streaming)
@@ -128,8 +126,8 @@ static void videobuf_vm_close(struct vm_area_struct *vma)kfree (map); +videobuf_queue_unlock (q); } -videobuf_queue_unlock (q); }static const struct vm_operations_struct videobuf_vm_ops = {
drivers/media/v4l2-core/videobuf-dma-sg.c +4 -6
@@ -338,14 +338,11 @@ EXPORT_SYMBOL_GPL(videobuf_dma_free);static void videobuf_vm_open (struct vm_area_struct *vma) {struct videobuf_mapping *map = vma->vm_private_data; -struct videobuf_queue *q = map->q;dprintk (2 ,"vm_open %p [count=%d,vma=%08lx-%08lx]\n" , map, map->count, vma->vm_start, vma->vm_end); -videobuf_queue_lock (q); map->count++; -videobuf_queue_unlock (q); }static void videobuf_vm_close (struct vm_area_struct *vma)
@@ -358,9 +355,10 @@ static void videobuf_vm_close(struct vm_area_struct *vma)dprintk (2 ,"vm_close %p [count=%d,vma=%08lx-%08lx]\n" , map, map->count, vma->vm_start, vma->vm_end); -videobuf_queue_lock (q); -if (!--map->count) { + map->count--; +if (0 == map->count) {dprintk (1 ,"munmap %p q=%p\n" , map, q); +videobuf_queue_lock (q);for (i =0 ; i <VIDEO_MAX_FRAME ; i++) {if (NULL == q->bufs[i])continue ;
@@ -376,9 +374,9 @@ static void videobuf_vm_close(struct vm_area_struct *vma) q->bufs[i]->baddr =0 ; q->ops->buf_release (q, q->bufs[i]); } +videobuf_queue_unlock (q);kfree (map); } -videobuf_queue_unlock (q);return ; }
drivers/media/v4l2-core/videobuf-vmalloc.c +4 -6
@@ -54,14 +54,11 @@ MODULE_LICENSE("GPL");static void videobuf_vm_open (struct vm_area_struct *vma) {struct videobuf_mapping *map = vma->vm_private_data; -struct videobuf_queue *q = map->q;dprintk (2 ,"vm_open %p [count=%u,vma=%08lx-%08lx]\n" , map, map->count, vma->vm_start, vma->vm_end); -videobuf_queue_lock (q); map->count++; -videobuf_queue_unlock (q); }static void videobuf_vm_close (struct vm_area_struct *vma)
@@ -73,11 +70,12 @@ static void videobuf_vm_close(struct vm_area_struct *vma)dprintk (2 ,"vm_close %p [count=%u,vma=%08lx-%08lx]\n" , map, map->count, vma->vm_start, vma->vm_end); -videobuf_queue_lock (q); -if (!--map->count) { + map->count--; +if (0 == map->count) {struct videobuf_vmalloc_memory *mem;dprintk (1 ,"munmap %p q=%p\n" , map, q); +videobuf_queue_lock (q);/* We need first to cancel streams, before unmapping */ if (q->streaming)
@@ -116,8 +114,8 @@ static void videobuf_vm_close(struct vm_area_struct *vma)kfree (map); +videobuf_queue_unlock (q); } -videobuf_queue_unlock (q);return ; }
drivers/pinctrl/core.c +2 -0
@@ -851,7 +851,9 @@ static struct pinctrl *create_pinctrl(struct device *dev)kref_init (&p->users);/* Add the pinctrl handle to the global list */ +mutex_lock (&pinctrl_list_mutex);list_add_tail (&p->node, &pinctrl_list); +mutex_unlock (&pinctrl_list_mutex);return p; }
drivers/pinctrl/pinctrl-at91.c +5 -5
@@ -1260,22 +1260,22 @@ static int alt_gpio_irq_type(struct irq_data *d, unsigned type)switch (type) {case IRQ_TYPE_EDGE_RISING : -irq_set_handler (d->irq, handle_simple_irq); +__irq_set_handler_locked (d->irq, handle_simple_irq);writel_relaxed (mask, pio +PIO_ESR );writel_relaxed (mask, pio +PIO_REHLSR );break ;case IRQ_TYPE_EDGE_FALLING : -irq_set_handler (d->irq, handle_simple_irq); +__irq_set_handler_locked (d->irq, handle_simple_irq);writel_relaxed (mask, pio +PIO_ESR );writel_relaxed (mask, pio +PIO_FELLSR );break ;case IRQ_TYPE_LEVEL_LOW : -irq_set_handler (d->irq, handle_level_irq); +__irq_set_handler_locked (d->irq, handle_level_irq);writel_relaxed (mask, pio +PIO_LSR );writel_relaxed (mask, pio +PIO_FELLSR );break ;case IRQ_TYPE_LEVEL_HIGH : -irq_set_handler (d->irq, handle_level_irq); +__irq_set_handler_locked (d->irq, handle_level_irq);writel_relaxed (mask, pio +PIO_LSR );writel_relaxed (mask, pio +PIO_REHLSR );break ;
@@ -1284,7 +1284,7 @@ static int alt_gpio_irq_type(struct irq_data *d, unsigned type)* disable additional interrupt modes: * fall back to default behavior */ -irq_set_handler (d->irq, handle_simple_irq); +__irq_set_handler_locked (d->irq, handle_simple_irq);writel_relaxed (mask, pio +PIO_AIMDR );return 0 ;case IRQ_TYPE_NONE :
drivers/pinctrl/pinctrl-imx1-core.c +5 -5
@@ -45,7 +45,7 @@ struct imx1_pinctrl {#define MX1_DDIR 0x00#define MX1_OCR 0x04#define MX1_ICONFA 0x0c -#define MX1_ICONFB 0x10 +#define MX1_ICONFB 0x14#define MX1_GIUS 0x20#define MX1_GPR 0x38#define MX1_PUEN 0x40
@@ -97,13 +97,13 @@ static void imx1_write_2bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,u32 old_val;u32 new_val; -dev_dbg (ipctl->dev,"write: register 0x%p offset %d value 0x%x\n" , - reg, offset, value); -/* Use the next register if the pin's port pin number is >=16 */ if (pin_id %32 >=16 ) reg +=0x04 ; +dev_dbg (ipctl->dev,"write: register 0x%p offset %d value 0x%x\n" , + reg, offset, value); +/* Get current state of pins */ old_val =readl (reg); old_val &= mask;
@@ -139,7 +139,7 @@ static int imx1_read_2bit(struct imx1_pinctrl *ipctl, unsigned int pin_id, u32 reg_offset) {void __iomem *reg =imx1_mem (ipctl, pin_id) + reg_offset; -int offset = pin_id %16 ; +int offset = (pin_id %16 ) *2 ;/* Use the next register if the pin's port pin number is >=16 */ if (pin_id %32 >=16 )
drivers/pinctrl/vt8500/pinctrl-wmt.c +14 -1
@@ -276,7 +276,20 @@ static int wmt_pctl_dt_node_to_map_pull(struct wmt_pinctrl_data *data,if (!configs)return -ENOMEM ; - configs[0 ] = pull; +switch (pull) { +case 0 : + configs[0 ] =PIN_CONFIG_BIAS_DISABLE ; +break ; +case 1 : + configs[0 ] =PIN_CONFIG_BIAS_PULL_DOWN ; +break ; +case 2 : + configs[0 ] =PIN_CONFIG_BIAS_PULL_UP ; +break ; +default : + configs[0 ] =PIN_CONFIG_BIAS_DISABLE ; +dev_err (data->dev,"invalid pull state %d - disabling\n" , pull); + } map->type =PIN_MAP_TYPE_CONFIGS_PIN ; map->data.configs.group_or_pin = data->groups[group];
drivers/regulator/core.c +8 -1
@@ -1272,6 +1272,8 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev,if (r->dev.parent && node == r->dev.of_node)return r; + *ret = -EPROBE_DEFER ; +return NULL ; }else {/* * If we couldn't even get the node then it's
@@ -1312,7 +1314,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,struct regulator_dev *rdev;struct regulator *regulator =ERR_PTR (-EPROBE_DEFER );const char *devname =NULL ; -int ret = -EPROBE_DEFER ; +int ret;if (id ==NULL ) {pr_err ("get() with no identifier\n" );
@@ -1322,6 +1324,11 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,if (dev) devname =dev_name (dev); +if (have_full_constraints ()) + ret = -ENODEV ; +else + ret = -EPROBE_DEFER ; +mutex_lock (®ulator_list_mutex); rdev =regulator_dev_lookup (dev, id, &ret);
fs/btrfs/inode.c +1 -1
@@ -2610,7 +2610,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) EXTENT_DEFRAG, 1, cached_state);if (ret) {u64 last_snapshot =btrfs_root_last_snapshot (&root->root_item); -if (last_snapshot >=BTRFS_I (inode)->generation) +if (0 && last_snapshot >=BTRFS_I (inode)->generation)/* the inode is shared */ new =record_old_file_extents (inode, ordered_extent);
fs/buffer.c +4 -2
@@ -654,14 +654,16 @@ EXPORT_SYMBOL(mark_buffer_dirty_inode);static void __set_page_dirty (struct page *page,struct address_space *mapping,int warn) { -spin_lock_irq (&mapping->tree_lock); +unsigned long flags; + +spin_lock_irqsave (&mapping->tree_lock, flags);if (page->mapping) {/* Race with truncate? */ WARN_ON_ONCE (warn && !PageUptodate (page));account_page_dirtied (page, mapping);radix_tree_tag_set (&mapping->page_tree,page_index (page),PAGECACHE_TAG_DIRTY ); } -spin_unlock_irq (&mapping->tree_lock); +spin_unlock_irqrestore (&mapping->tree_lock, flags);__mark_inode_dirty (mapping->host,I_DIRTY_PAGES ); }
fs/nfs/nfs4client.c +1 -1
@@ -169,7 +169,7 @@ void nfs41_shutdown_client(struct nfs_client *clp)void nfs40_shutdown_client (struct nfs_client *clp) {if (clp->cl_slot_tbl) { -nfs4_release_slot_table (clp->cl_slot_tbl); +nfs4_shutdown_slot_table (clp->cl_slot_tbl);kfree (clp->cl_slot_tbl); } }
fs/nfs/nfs4proc.c +4 -4
@@ -1622,15 +1622,15 @@ static void nfs4_open_confirm_prepare(struct rpc_task *task, void *calldata) {struct nfs4_opendata *data = calldata; -nfs40_setup_sequence (data->o_arg.server, &data->o_arg.seq_args, - &data->o_res.seq_res, task); +nfs40_setup_sequence (data->o_arg.server, &data->c_arg.seq_args, + &data->c_res.seq_res, task); }static void nfs4_open_confirm_done (struct rpc_task *task,void *calldata) {struct nfs4_opendata *data = calldata; -nfs40_sequence_done (task, &data->o_res.seq_res); +nfs40_sequence_done (task, &data->c_res.seq_res); data->rpc_status = task->tk_status;if (data->rpc_status ==0 ) {
@@ -1688,7 +1688,7 @@ static int _nfs4_proc_open_confirm(struct nfs4_opendata *data) };int status; -nfs4_init_sequence (&data->o_arg.seq_args, &data->o_res.seq_res,1 ); +nfs4_init_sequence (&data->c_arg.seq_args, &data->c_res.seq_res,1 );kref_get (&data->kref); data->rpc_done =0 ; data->rpc_status =0 ;
fs/nfs/nfs4session.c +20 -5
@@ -231,14 +231,23 @@ out:return ret; } +/* +* nfs4_release_slot_table - release all slot table entries +*/ +static void nfs4_release_slot_table (struct nfs4_slot_table *tbl) +{ +nfs4_shrink_slot_table (tbl,0 ); +} +/** -* nfs4_release_slot_table - release resources attached to a slot table +* nfs4_shutdown_slot_table - release resources attached to a slot table * @tbl: slot table to shut down * */ -void nfs4_release_slot_table (struct nfs4_slot_table *tbl) +void nfs4_shutdown_slot_table (struct nfs4_slot_table *tbl) { -nfs4_shrink_slot_table (tbl,0 ); +nfs4_release_slot_table (tbl); +rpc_destroy_wait_queue (&tbl->slot_tbl_waitq); }/**
@@ -422,7 +431,7 @@ void nfs41_update_target_slotid(struct nfs4_slot_table *tbl,spin_unlock (&tbl->slot_tbl_lock); } -static void nfs4_destroy_session_slot_tables (struct nfs4_session *session) +static void nfs4_release_session_slot_tables (struct nfs4_session *session) {nfs4_release_slot_table (&session->fc_slot_table);nfs4_release_slot_table (&session->bc_slot_table);
@@ -450,7 +459,7 @@ int nfs4_setup_session_slot_tables(struct nfs4_session *ses)if (status && tbl->slots ==NULL )/* Fore and back channel share a connection so get * both slot tables or neither */ -nfs4_destroy_session_slot_tables (ses); +nfs4_release_session_slot_tables (ses);return status; }
@@ -470,6 +479,12 @@ struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp)return session; } +static void nfs4_destroy_session_slot_tables (struct nfs4_session *session) +{ +nfs4_shutdown_slot_table (&session->fc_slot_table); +nfs4_shutdown_slot_table (&session->bc_slot_table); +} +void nfs4_destroy_session (struct nfs4_session *session) {struct rpc_xprt *xprt;
fs/nfs/nfs4session.h +1 -1
@@ -74,7 +74,7 @@ enum nfs4_session_state {extern int nfs4_setup_slot_table (struct nfs4_slot_table *tbl,unsigned int max_reqs,const char *queue); -extern void nfs4_release_slot_table (struct nfs4_slot_table *tbl); +extern void nfs4_shutdown_slot_table (struct nfs4_slot_table *tbl);extern struct nfs4_slot *nfs4_alloc_slot (struct nfs4_slot_table *tbl);extern void nfs4_free_slot (struct nfs4_slot_table *tbl,struct nfs4_slot *slot);extern void nfs4_slot_tbl_drain_complete (struct nfs4_slot_table *tbl);
include/linux/nfs_xdr.h +2 -0
@@ -379,12 +379,14 @@ struct nfs_openres {* Arguments to the open_confirm call. */ struct nfs_open_confirmargs { +struct nfs4_sequence_args seq_args;const struct nfs_fh * fh;nfs4_stateid * stateid;struct nfs_seqid * seqid; };struct nfs_open_confirmres { +struct nfs4_sequence_res seq_res;nfs4_stateid stateid;struct nfs_seqid * seqid; };
kernel/irq/Kconfig +1 -0
@@ -40,6 +40,7 @@ config IRQ_EDGE_EOI_HANDLER # Generic configurable interrupt chip implementation config GENERIC_IRQ_CHIP bool + select IRQ_DOMAIN # Generic irq_domain hw <--> linux irq number translation config IRQ_DOMAIN
lib/Makefile +1 -0
@@ -43,6 +43,7 @@ obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o +GCOV_PROFILE_hweight.o := n CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
mm/page-writeback.c +3 -2
@@ -2173,11 +2173,12 @@ int __set_page_dirty_nobuffers(struct page *page)if (!TestSetPageDirty (page)) {struct address_space *mapping =page_mapping (page);struct address_space *mapping2; +unsigned long flags;if (!mapping)return 1 ; -spin_lock_irq (&mapping->tree_lock); +spin_lock_irqsave (&mapping->tree_lock, flags); mapping2 =page_mapping (page);if (mapping2) {/* Race with truncate? */ BUG_ON (mapping2 != mapping);
@@ -2186,7 +2187,7 @@ int __set_page_dirty_nobuffers(struct page *page)radix_tree_tag_set (&mapping->page_tree,page_index (page),PAGECACHE_TAG_DIRTY ); } -spin_unlock_irq (&mapping->tree_lock); +spin_unlock_irqrestore (&mapping->tree_lock, flags);if (mapping->host) {/* !PageAnon && !swapper_space */ __mark_inode_dirty (mapping->host,I_DIRTY_PAGES );
mm/swapfile.c +10 -1
@@ -1922,7 +1922,6 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) p->swap_map =NULL ; cluster_info = p->cluster_info; p->cluster_info =NULL ; - p->flags =0 ; frontswap_map =frontswap_map_get (p);spin_unlock (&p->lock);spin_unlock (&swap_lock);
@@ -1948,6 +1947,16 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)mutex_unlock (&inode->i_mutex); }filp_close (swap_file,NULL ); + +/* +* Clear the SWP_USED flag after all resources are freed so that swapon +* can reuse this swap_info in alloc_swap_info() safely. It is ok to +* not hold p->lock after we cleared its SWP_WRITEOK. +*/ +spin_lock (&swap_lock); + p->flags =0 ; +spin_unlock (&swap_lock); + err =0 ;atomic_inc (&proc_poll_event);wake_up_interruptible (&proc_poll_wait);
security/selinux/ss/services.c +4 -0
@@ -1232,6 +1232,10 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len,struct context context;int rc =0 ; +/* An empty security context is never valid. */ +if (!scontext_len) +return -EINVAL ; +if (!ss_initialized) {int i;
sound/pci/hda/patch_analog.c +27 -0
@@ -243,6 +243,19 @@ static void ad_fixup_inv_jack_detect(struct hda_codec *codec, } } +/* Toshiba Satellite L40 implements EAPD in a standard way unlike others */ +static void ad1986a_fixup_eapd (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct ad198x_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { + codec->inv_eapd =0 ; + spec->gen.keep_eapd_on =1 ; + spec->eapd_nid =0x1b ; + } +} +enum {AD1986A_FIXUP_INV_JACK_DETECT ,AD1986A_FIXUP_ULTRA ,
@@ -250,6 +263,7 @@ enum {AD1986A_FIXUP_3STACK ,AD1986A_FIXUP_LAPTOP ,AD1986A_FIXUP_LAPTOP_IMIC , + AD1986A_FIXUP_EAPD, }; static const struct hda_fixup ad1986a_fixups[] = {
@@ -310,6 +324,10 @@ static const struct hda_fixup ad1986a_fixups[] = { .chained_before = 1, .chain_id = AD1986A_FIXUP_LAPTOP, }, + [AD1986A_FIXUP_EAPD] = { + .type = HDA_FIXUP_FUNC, + .v.func = ad1986a_fixup_eapd, + }, }; static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {
@@ -317,6 +335,7 @@ static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {SND_PCI_QUIRK_MASK (0x1043 ,0xff00 ,0x8100 ,"ASUS P5" ,AD1986A_FIXUP_3STACK ),SND_PCI_QUIRK_MASK (0x1043 ,0xff00 ,0x8200 ,"ASUS M2" ,AD1986A_FIXUP_3STACK ),SND_PCI_QUIRK (0x10de ,0xcb84 ,"ASUS A8N-VM" ,AD1986A_FIXUP_3STACK ), +SND_PCI_QUIRK (0x1179 ,0xff40 ,"Toshiba Satellite L40" ,AD1986A_FIXUP_EAPD ),SND_PCI_QUIRK (0x144d ,0xc01e ,"FSC V2060" ,AD1986A_FIXUP_LAPTOP ),SND_PCI_QUIRK_MASK (0x144d ,0xff00 ,0xc000 ,"Samsung" ,AD1986A_FIXUP_SAMSUNG ), SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_FIXUP_ULTRA),
@@ -471,6 +490,8 @@ static int ad1983_add_spdif_mux_ctl(struct hda_codec *codec)static int patch_ad1983 (struct hda_codec *codec) {struct ad198x_spec *spec; +static hda_nid_t conn_0c[] = {0x08 }; +static hda_nid_t conn_0d[] = {0x09 };int err; err =alloc_ad_spec (codec);
@@ -478,8 +499,14 @@ static int patch_ad1983(struct hda_codec *codec)return err; spec = codec->spec; + spec->gen.mixer_nid =0x0e ; spec->gen.beep_nid =0x10 ;set_beep_amp (spec,0x10 ,0 ,HDA_OUTPUT ); + +/* limit the loopback routes not to confuse the parser */ +snd_hda_override_conn_list (codec,0x0c ,ARRAY_SIZE (conn_0c), conn_0c); +snd_hda_override_conn_list (codec,0x0d ,ARRAY_SIZE (conn_0d), conn_0d); + err =ad198x_parse_auto_config (codec, false);if (err <0 ) goto error;
sound/pci/hda/patch_realtek.c +8 -1
@@ -1782,6 +1782,7 @@ enum {ALC889_FIXUP_IMAC91_VREF ,ALC889_FIXUP_MBA11_VREF ,ALC889_FIXUP_MBA21_VREF , +ALC889_FIXUP_MP11_VREF ,ALC882_FIXUP_INV_DMIC ,ALC882_FIXUP_NO_PRIMARY_HP , ALC887_FIXUP_ASUS_BASS,
@@ -2142,6 +2143,12 @@ static const struct hda_fixup alc882_fixups[] = { .chained = true, .chain_id = ALC889_FIXUP_MBP_VREF, }, + [ALC889_FIXUP_MP11_VREF] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc889_fixup_mba11_vref, + .chained = true, + .chain_id = ALC885_FIXUP_MACPRO_GPIO, + }, [ALC882_FIXUP_INV_DMIC] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_inv_dmic_0x12,
@@ -2205,7 +2212,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {SND_PCI_QUIRK (0x106b ,0x00a0 ,"MacBookPro 3,1" ,ALC889_FIXUP_MBP_VREF ),SND_PCI_QUIRK (0x106b ,0x00a1 ,"Macbook" ,ALC889_FIXUP_MBP_VREF ),SND_PCI_QUIRK (0x106b ,0x00a4 ,"MacbookPro 4,1" ,ALC889_FIXUP_MBP_VREF ), -SND_PCI_QUIRK (0x106b ,0x0c00 ,"Mac Pro" ,ALC885_FIXUP_MACPRO_GPIO ), +SND_PCI_QUIRK (0x106b ,0x0c00 ,"Mac Pro" ,ALC889_FIXUP_MP11_VREF ),SND_PCI_QUIRK (0x106b ,0x1000 ,"iMac 24" ,ALC885_FIXUP_MACPRO_GPIO ),SND_PCI_QUIRK (0x106b ,0x2800 ,"AppleTV" ,ALC885_FIXUP_MACPRO_GPIO ), SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC889_FIXUP_MBP_VREF),
sound/usb/Kconfig +1 -0
@@ -14,6 +14,7 @@ config SND_USB_AUDIO select SND_HWDEP select SND_RAWMIDI select SND_PCM + select BITREVERSE help Say Y here to include support for USB audio and USB MIDI devices.