Linux 3.19.4
Greg KH
maintainerI'm announcing the release of the 3.19.4 kernel.
All users of the 3.19 kernel series must upgrade.
The updated 3.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.19.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/arm64/include/asm/cmpxchg.h | 32 +++-- arch/arm64/include/asm/mmu_context.h | 9 + arch/arm64/include/asm/percpu.h | 44 +++++-- arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 1 arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi | 1 arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi | 1 arch/powerpc/kernel/exceptions-64s.S | 2 arch/powerpc/platforms/pseries/mobility.c | 44 +++---- drivers/base/regmap/internal.h | 8 + drivers/base/regmap/regcache-rbtree.c | 2 drivers/base/regmap/regcache.c | 16 +- drivers/base/regmap/regmap.c | 32 ++--- drivers/clocksource/time-efm32.c | 4 drivers/clocksource/timer-sun5i.c | 8 - drivers/cpuidle/cpuidle-mvebu-v7.c | 4 drivers/dma/dw/platform.c | 5 drivers/input/mouse/synaptics.c | 142 ++++++++++++++++------- drivers/md/dm-io.c | 15 +- drivers/md/dm-snap.c | 120 +++++++++++++++++-- drivers/md/dm-thin.c | 11 - drivers/md/dm.c | 21 +++ drivers/mfd/kempld-core.c | 2 drivers/net/ethernet/amd/pcnet32.c | 31 ++++- drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 15 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 6 drivers/net/wireless/iwlwifi/iwl-2000.c | 13 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 6 drivers/net/wireless/iwlwifi/iwl-6000.c | 18 +- drivers/net/wireless/iwlwifi/mvm/coex.c | 3 drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 3 drivers/net/wireless/iwlwifi/mvm/rs.c | 21 ++- drivers/net/wireless/iwlwifi/mvm/time-event.c | 9 - drivers/net/wireless/rtlwifi/base.c | 7 - drivers/of/irq.c | 10 + drivers/phy/phy-core.c | 4 drivers/powercap/intel_rapl.c | 54 ++++++-- drivers/regulator/palmas-regulator.c | 4 drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 drivers/spi/spi-dw-mid.c | 6 drivers/spi/spi-qup.c | 9 - drivers/spi/spi.c | 5 drivers/staging/vt6655/device_main.c | 16 -- drivers/staging/vt6655/rf.c | 1 drivers/staging/vt6656/rf.c | 1 drivers/target/tcm_fc/tfc_io.c | 3 drivers/usb/chipidea/udc.c | 11 + drivers/usb/common/usb-otg-fsm.c | 4 drivers/usb/phy/phy-am335x-control.c | 3 drivers/usb/storage/unusual_uas.h | 7 + drivers/virtio/virtio_balloon.c | 21 ++- fs/hfsplus/brec.c | 20 +-- include/linux/device-mapper.h | 1 include/linux/mfd/palmas.h | 3 include/trace/events/regmap.h | 123 +++++++++---------- kernel/events/core.c | 10 + net/mac80211/ieee80211_i.h | 23 ++- net/mac80211/rx.c | 3 net/mac80211/util.c | 2 net/wireless/nl80211.c | 10 + sound/soc/codecs/adav80x.c | 4 sound/soc/codecs/ak4641.c | 4 sound/soc/codecs/ak4671.c | 44 +++---- sound/soc/codecs/cs4271.c | 4 sound/soc/codecs/da732x.c | 8 - sound/soc/codecs/es8328.c | 4 sound/soc/codecs/pcm1681.c | 4 sound/soc/codecs/sgtl5000.c | 8 - sound/soc/codecs/sn95031.c | 4 sound/soc/codecs/tas5086.c | 4 sound/soc/codecs/wm2000.c | 8 - sound/soc/codecs/wm8731.c | 4 sound/soc/codecs/wm8903.c | 4 sound/soc/codecs/wm8904.c | 4 sound/soc/codecs/wm8955.c | 4 sound/soc/codecs/wm8960.c | 4 sound/soc/codecs/wm9712.c | 6 sound/soc/codecs/wm9713.c | 6 78 files changed, 771 insertions(+), 371 deletions(-)
Ameya Palande (1):
mfd: kempld-core: Fix callback return value check
Andrei Otcheretianski (2):
mac80211: count interfaces correctly for combination checks
iwlwifi: mvm: Fix ROC removal
Andy Shevchenko (2):
dmaengine: dw: append MODULE_ALIAS for platform driver
spi: dw-mid: clear BUSY flag fist and test other one
Bart Van Assche (1):
tcm_qla2xxx: Fix incorrect use of __transport_register_session
Benjamin Tissoires (3):
Input: synaptics - skip quirks when post-2013 dimensions
Input: synaptics - handle spurious release of trackstick buttons
Input: synaptics - do not retrieve the board id on old firmwares
Bob Copeland (1):
mac80211: drop unencrypted frames in mesh fwding
Catalin Marinas (1):
arm64: Use the reserved TTBR0 if context switching to the init_mm
Dan Carpenter (1):
tcm_fc: missing curly braces in ft_invl_hw_context()
Daniel Martin (5):
Input: synaptics - split synaptics_resolution(), query first
Input: synaptics - log queried and quirked dimension values
Input: synaptics - query min dimensions for fw v8.1
Input: synaptics - remove obsolete min/max quirk for X240
Input: synaptics - support min/max board id in min_max_pnpid_table
Darrick J. Wong (1):
dm io: deal with wandering queue limits when handling REQ_DISCARD and REQ_WRITE_SAME
David Dueck (1):
usb: phy: am335x-control: check return value of bus_find_device
Dmitry Torokhov (1):
Input: synaptics - fix middle button on Lenovo 2015 products
Emmanuel Grumbach (2):
iwlwifi: fix max_ht_ampdu_exponent for older devices
iwlwifi: mvm: BT Coex - fix a NULL pointer exception
Eric Nelson (1):
ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP
Eyal Shapira (1):
iwlwifi: mvm: rs: fix BT Coex check to look at the correct ant
Greg Kroah-Hartman (1):
Linux 3.19.4
Gregory CLEMENT (1):
cpuidle: mvebu: Fix the CPU PM notifier usage
Hans de Goede (1):
uas: Add US_FL_NO_ATA_1X for Initio Corporation controllers / devices
Ivan T. Ivanov (1):
spi: qup: Fix cs-num DT property parsing
Jacob Pan (1):
powercap / RAPL: handle domains with different energy units
Joe Thornber (1):
dm thin: fix to consistently zero-fill reads to unprovisioned blocks
Johannes Berg (1):
nl80211: ignore HT/VHT capabilities without QoS/WMM
Keerthy (1):
regulator: palmas: Correct TPS659038 register definition for REGEN2
Larry Finger (1):
rtlwifi: Improve handling of IPv6 packets
Lars-Peter Clausen (4):
ASoC: da732x: Fix control-less DAPM routes
ASoC: ak4671: Fix control-less DAPM routes
ASoC: sn95031: Fix control-less DAPM routes
regmap: regcache-rbtree: Fix present bitmap resize
Laurent Pinchart (1):
of/irq: Fix of_irq_parse_one() returned error codes
Li Jun (1):
usb: chipidea: otg: add a_alt_hnp_support response for B device
Mahesh Salgaonkar (1):
powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER
Malcolm Priestley (3):
staging: vt6656: vnt_rf_setpower: fix missing rate RATE_12M
vt6655: RFbSetPower fix missing rate RATE_12M
vt6655: Fix late setting of byRFType.
Markos Chandras (1):
net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5}Michael S. Tsirkin (2):
virtio_balloon: set DRIVER_OK before using device
virtio-balloon: do not call blocking ops when !TASK_RUNNING
Michal Kazior (1):
mac80211: disable u-APSD queues by default
Mikulas Patocka (3):
dm: hold suspend_lock while suspending device during device deletion dm snapshot: suspend origin when doing exception handover dm snapshot: suspend merging snapshot when doing exception handover
Peter Chen (1):
usb: common: otg-fsm: only signal connect after switching to peripheral
Peter Zijlstra (1):
perf: Fix irq_work 'tail' recursion
Philipp Zabel (1):
regmap: introduce regmap_name to fix syscon regmap trace events
Pontus Fuchs (1):
brcmfmac: Perform bound checking on vendor command buffer
Scott Wood (1):
powerpc/mpc85xx: Add ranges to etsec2 nodes
Sergei Antonov (1):
hfsplus: fix B-tree corruption after insertion at position 0
Steve Capper (1):
arm64: percpu: Make this_cpu accessors pre-empt safe
Takashi Iwai (14):
ASoC: pcm1681: Fix wrong value references for boolean kctl
ASoC: cs4271: Fix wrong value references for boolean kctl
ASoC: es8238: Fix wrong value references for boolean kctl
ASoC: wm8960: Fix wrong value references for boolean kctl
ASoC: tas5086: Fix wrong value references for boolean kctl
ASoC: wm8731: Fix wrong value references for boolean kctl
ASoC: wm2000: Fix wrong value references for boolean kctl
ASoC: wm8903: Fix wrong value references for boolean kctl
ASoC: wm8904: Fix wrong value references for boolean kctl
ASoC: ak4641: Fix wrong value references for boolean kctl
ASoC: adav80x: Fix wrong value references for boolean kctl
ASoC: wm8955: Fix wrong value references for boolean kctl
ASoC: wm9712: Fix wrong value references for boolean kctl
ASoC: wm9713: Fix wrong value references for boolean kctl
Thierry Reding (1):
phy: Find the right match in devm_phy_destroy()
Tyrel Datwyler (1):
powerpc/pseries: Little endian fixes for post mobility device tree update
Uwe Kleine-König (1):
spi: trigger trace event for message-done before mesg->complete
Yongbae Park (2):
clockevents: sun5i: Fix setup_irq init sequence
clocksource: efm32: Fix a NULL pointer dereference
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 19 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Diseased Newt
arch/arm64/include/asm/cmpxchg.h +24 -8
@@ -246,14 +246,30 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, __ret; \ }) -#define this_cpu_cmpxchg_1 (ptr, o, n) cmpxchg_local(raw_cpu_ptr(&(ptr)), o, n) -#define this_cpu_cmpxchg_2 (ptr, o, n) cmpxchg_local(raw_cpu_ptr(&(ptr)), o, n) -#define this_cpu_cmpxchg_4 (ptr, o, n) cmpxchg_local(raw_cpu_ptr(&(ptr)), o, n) -#define this_cpu_cmpxchg_8 (ptr, o, n) cmpxchg_local(raw_cpu_ptr(&(ptr)), o, n) - -#define this_cpu_cmpxchg_double_8 (ptr1, ptr2, o1, o2, n1, n2) \ - cmpxchg_double_local(raw_cpu_ptr(&(ptr1)), raw_cpu_ptr(&(ptr2)), \ - o1, o2, n1, n2) +#define _protect_cmpxchg_local (pcp, o, n) \ +({ \ + typeof(*raw_cpu_ptr(&(pcp))) __ret; \ + preempt_disable(); \ + __ret = cmpxchg_local(raw_cpu_ptr(&(pcp)), o, n); \ + preempt_enable(); \ + __ret; \ +}) + +#define this_cpu_cmpxchg_1 (ptr, o, n) _protect_cmpxchg_local(ptr, o, n) +#define this_cpu_cmpxchg_2 (ptr, o, n) _protect_cmpxchg_local(ptr, o, n) +#define this_cpu_cmpxchg_4 (ptr, o, n) _protect_cmpxchg_local(ptr, o, n) +#define this_cpu_cmpxchg_8 (ptr, o, n) _protect_cmpxchg_local(ptr, o, n) + +#define this_cpu_cmpxchg_double_8 (ptr1, ptr2, o1, o2, n1, n2) \ +({ \ + int __ret; \ + preempt_disable(); \ + __ret = cmpxchg_double_local( raw_cpu_ptr(&(ptr1)), \ + raw_cpu_ptr(&(ptr2)), \ + o1, o2, n1, n2); \ + preempt_enable(); \ + __ret; \ +})#define cmpxchg64 (ptr,o,n) cmpxchg((ptr),(o),(n))#define cmpxchg64_local (ptr,o,n) cmpxchg_local((ptr),(o),(n))
arch/arm64/include/asm/mmu_context.h +9 -0
@@ -151,6 +151,15 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, {unsigned int cpu =smp_processor_id (); +/* +* init_mm.pgd does not contain any user mappings and it is always +* active for kernel addresses in TTBR1. Just set the reserved TTBR0. +*/ +if (next == &init_mm) { +cpu_set_reserved_ttbr0 (); +return ; + } +if (!cpumask_test_and_set_cpu (cpu,mm_cpumask (next)) || prev != next)check_and_switch_context (next, tsk); }
arch/arm64/include/asm/percpu.h +33 -11
58 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi +1 -0
@@ -50,6 +50,7 @@ ethernet@b0000 { fsl,num_tx_queues = <0x8>; fsl,magic-packet; local-mac-address = [ 00 00 00 00 00 00 ]; + ranges; queue-group@b0000 { #address-cells = <1>;
arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi +1 -0
@@ -50,6 +50,7 @@ ethernet@b1000 { fsl,num_tx_queues = <0x8>; fsl,magic-packet; local-mac-address = [ 00 00 00 00 00 00 ]; + ranges; queue-group@b1000 { #address-cells = <1>;
arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi +1 -0
@@ -49,6 +49,7 @@ ethernet@b2000 { fsl,num_tx_queues = <0x8>; fsl,magic-packet; local-mac-address = [ 00 00 00 00 00 00 ]; + ranges; queue-group@b2000 { #address-cells = <1>;
arch/powerpc/kernel/exceptions-64s.S +1 -1
@@ -1408,7 +1408,7 @@ machine_check_handle_early: bne 9f /* continue in V mode if we are. */ 5: -#ifdef CONFIG_KVM_BOOK3S_64_HV +#ifdef CONFIG_KVM_BOOK3S_64_HANDLER /* * We are coming from kernel context. Check if we are coming from * guest. if yes, then we can continue. We will fall through
arch/powerpc/platforms/pseries/mobility.c +23 -21
124 lines not on this page · raw message
drivers/base/regmap/internal.h +8 -0
@@ -237,4 +237,12 @@ extern struct regcache_ops regcache_rbtree_ops;extern struct regcache_ops regcache_lzo_ops;extern struct regcache_ops regcache_flat_ops; +static inline const char *regmap_name (const struct regmap *map) +{ +if (map->dev) +return dev_name (map->dev); + +return map->name; +} +#endif
drivers/base/regmap/regcache-rbtree.c +1 -1
@@ -307,7 +307,7 @@ static int regcache_rbtree_insert_to_block(struct regmap *map,if (pos ==0 ) {memmove (blk + offset * map->cache_word_size, blk, rbnode->blklen * map->cache_word_size); -bitmap_shift_right (present, present, offset, blklen); +bitmap_shift_left (present, present, offset, blklen); }/* update the rbnode block, its size and the base register */
drivers/base/regmap/regcache.c +8 -8
@@ -218,7 +218,7 @@ int regcache_read(struct regmap *map, ret = map->cache_ops->read (map, reg, value);if (ret ==0 ) -trace_regmap_reg_read_cache (map->dev, reg, *value); +trace_regmap_reg_read_cache (map, reg, *value);return ret; }
@@ -311,7 +311,7 @@ int regcache_sync(struct regmap *map)dev_dbg (map->dev,"Syncing %s cache\n" , map->cache_ops->name); name = map->cache_ops->name; -trace_regcache_sync (map->dev, name,"start" ); +trace_regcache_sync (map, name,"start" );if (!map->cache_dirty) goto out;
@@ -346,7 +346,7 @@ out:regmap_async_complete (map); -trace_regcache_sync (map->dev, name,"stop" ); +trace_regcache_sync (map, name,"stop" );return ret; }
@@ -381,7 +381,7 @@ int regcache_sync_region(struct regmap *map, unsigned int min, name = map->cache_ops->name;dev_dbg (map->dev,"Syncing %s cache from %d-%d\n" , name, min, max); -trace_regcache_sync (map->dev, name,"start region" ); +trace_regcache_sync (map, name,"start region" );if (!map->cache_dirty) goto out;
@@ -401,7 +401,7 @@ out:regmap_async_complete (map); -trace_regcache_sync (map->dev, name,"stop region" ); +trace_regcache_sync (map, name,"stop region" );return ret; }
@@ -428,7 +428,7 @@ int regcache_drop_region(struct regmap *map, unsigned int min, map->lock (map->lock_arg); -trace_regcache_drop_region (map->dev, min, max); +trace_regcache_drop_region (map, min, max); ret = map->cache_ops->drop (map, min, max);
@@ -455,7 +455,7 @@ void regcache_cache_only(struct regmap *map, bool enable) map->lock (map->lock_arg);WARN_ON (map->cache_bypass && enable); map->cache_only = enable; -trace_regmap_cache_only (map->dev, enable); +trace_regmap_cache_only (map, enable); map->unlock (map->lock_arg); }EXPORT_SYMBOL_GPL (regcache_cache_only);
@@ -493,7 +493,7 @@ void regcache_cache_bypass(struct regmap *map, bool enable) map->lock (map->lock_arg);WARN_ON (map->cache_only && enable); map->cache_bypass = enable; -trace_regmap_cache_bypass (map->dev, enable); +trace_regmap_cache_bypass (map, enable); map->unlock (map->lock_arg); }EXPORT_SYMBOL_GPL (regcache_cache_bypass);
drivers/base/regmap/regmap.c +14 -18
@@ -1280,7 +1280,7 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,if (map->async && map->bus->async_write) {struct regmap_async *async; -trace_regmap_async_write_start (map->dev, reg, val_len); +trace_regmap_async_write_start (map, reg, val_len);spin_lock_irqsave (&map->async_lock, flags); async = list_first_entry_or_null(&map->async_free,
@@ -1338,8 +1338,7 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,return ret; } -trace_regmap_hw_write_start (map->dev, reg, - val_len / map->format.val_bytes); +trace_regmap_hw_write_start (map, reg, val_len / map->format.val_bytes);/* If we're doing a single register write we can probably just * send the work_buf directly, otherwise try to do a gather
@@ -1371,8 +1370,7 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,kfree (buf); } -trace_regmap_hw_write_done (map->dev, reg, - val_len / map->format.val_bytes); +trace_regmap_hw_write_done (map, reg, val_len / map->format.val_bytes);return ret; }
@@ -1406,12 +1404,12 @@ static int _regmap_bus_formatted_write(void *context, unsigned int reg, map->format.format_write (map, reg, val); -trace_regmap_hw_write_start (map->dev, reg,1 ); +trace_regmap_hw_write_start (map, reg,1 ); ret = map->bus->write (map->bus_context, map->work_buf, map->format.buf_size); -trace_regmap_hw_write_done (map->dev, reg,1 ); +trace_regmap_hw_write_done (map, reg,1 );return ret; }
@@ -1469,7 +1467,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,dev_info (map->dev,"%x <= %x\n" , reg, val);#endif -trace_regmap_reg_write (map->dev, reg, val); +trace_regmap_reg_write (map, reg, val);return map->reg_write (context, reg, val); }
@@ -1772,7 +1770,7 @@ static int _regmap_raw_multi_reg_write(struct regmap *map,for (i =0 ; i < num_regs; i++) {int reg = regs[i].reg;int val = regs[i].def; -trace_regmap_hw_write_start (map->dev, reg,1 ); +trace_regmap_hw_write_start (map, reg,1 ); map->format.format_reg (u8, reg, map->reg_shift); u8 += reg_bytes + pad_bytes; map->format.format_val (u8, val,0 );
@@ -1787,7 +1785,7 @@ static int _regmap_raw_multi_reg_write(struct regmap *map,for (i =0 ; i < num_regs; i++) {int reg = regs[i].reg; -trace_regmap_hw_write_done (map->dev, reg,1 ); +trace_regmap_hw_write_done (map, reg,1 ); }return ret; }
@@ -2058,15 +2056,13 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,*/ u8[0 ] |= map->read_flag_mask; -trace_regmap_hw_read_start (map->dev, reg, - val_len / map->format.val_bytes); +trace_regmap_hw_read_start (map, reg, val_len / map->format.val_bytes); ret = map->bus->read (map->bus_context, map->work_buf, map->format.reg_bytes + map->format.pad_bytes, val, val_len); -trace_regmap_hw_read_done (map->dev, reg, - val_len / map->format.val_bytes); +trace_regmap_hw_read_done (map, reg, val_len / map->format.val_bytes);return ret; }
@@ -2122,7 +2118,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg,dev_info (map->dev,"%x => %x\n" , reg, *val);#endif -trace_regmap_reg_read (map->dev, reg, *val); +trace_regmap_reg_read (map, reg, *val);if (!map->cache_bypass)regcache_write (map, reg, *val);
@@ -2479,7 +2475,7 @@ void regmap_async_complete_cb(struct regmap_async *async, int ret)struct regmap *map = async->map;bool wake; -trace_regmap_async_io_complete (map->dev); +trace_regmap_async_io_complete (map);spin_lock (&map->async_lock);list_move (&async->list, &map->async_free);
@@ -2524,7 +2520,7 @@ int regmap_async_complete(struct regmap *map)if (!map->bus || !map->bus->async_write)return 0 ; -trace_regmap_async_complete_start (map->dev); +trace_regmap_async_complete_start (map);wait_event (map->async_waitq,regmap_async_is_done (map));
@@ -2533,7 +2529,7 @@ int regmap_async_complete(struct regmap *map) map->async_ret =0 ;spin_unlock_irqrestore (&map->async_lock, flags); -trace_regmap_async_complete_done (map->dev); +trace_regmap_async_complete_done (map);return ret; }
drivers/clocksource/time-efm32.c +2 -2
@@ -225,12 +225,12 @@ static int __init efm32_clockevent_init(struct device_node *np) clock_event_ddata.base = base; clock_event_ddata.periodic_top =DIV_ROUND_CLOSEST (rate,1024 *HZ ); -setup_irq (irq, &efm32_clock_event_irq); -clockevents_config_and_register (&clock_event_ddata.evtdev,DIV_ROUND_CLOSEST (rate,1024 ),0xf ,0xffff ); +setup_irq (irq, &efm32_clock_event_irq); +return 0 ; err_get_irq:
drivers/clocksource/timer-sun5i.c +4 -4
@@ -178,10 +178,6 @@ static void __init sun5i_timer_init(struct device_node *node) ticks_per_jiffy =DIV_ROUND_UP (rate,HZ ); - ret =setup_irq (irq, &sun5i_timer_irq); -if (ret) -pr_warn ("failed to setup irq %d\n" , irq); -/* Enable timer0 interrupt */ val =readl (timer_base +TIMER_IRQ_EN_REG );writel (val |TIMER_IRQ_EN (0 ), timer_base +TIMER_IRQ_EN_REG );
@@ -191,6 +187,10 @@ static void __init sun5i_timer_init(struct device_node *node)clockevents_config_and_register (&sun5i_clockevent, rate,TIMER_SYNC_TICKS ,0xffffffff ); + + ret =setup_irq (irq, &sun5i_timer_irq); +if (ret) +pr_warn ("failed to setup irq %d\n" , irq); }CLOCKSOURCE_OF_DECLARE (sun5i_a13,"allwinner,sun5i-a13-hstimer" , sun5i_timer_init);
drivers/cpuidle/cpuidle-mvebu-v7.c +2 -2
@@ -37,11 +37,11 @@ static int mvebu_v7_enter_idle(struct cpuidle_device *dev, deepidle = true; ret =mvebu_v7_cpu_suspend (deepidle); +cpu_pm_exit (); +if (ret)return ret; -cpu_pm_exit (); -return index; }
drivers/dma/dw/platform.c +4 -1
@@ -26,6 +26,8 @@#include "internal.h" +#define DRV_NAME "dw_dmac" +static struct dma_chan *dw_dma_of_xlate (struct of_phandle_args *dma_spec,struct of_dma *ofdma) {
@@ -284,7 +286,7 @@ static struct platform_driver dw_driver = { .remove = dw_remove, .shutdown = dw_shutdown, .driver = { - .name = "dw_dmac", + .name = DRV_NAME, .pm = &dw_dev_pm_ops, .of_match_table = of_match_ptr(dw_dma_of_id_table), .acpi_match_table = ACPI_PTR(dw_dma_acpi_id_table),
@@ -305,3 +307,4 @@ module_exit(dw_exit);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("Synopsys DesignWare DMA Controller platform driver" ); +MODULE_ALIAS ("platform:" DRV_NAME );
drivers/input/mouse/synaptics.c +103 -39
248 lines not on this page · raw message
drivers/md/dm-io.c +11 -4
@@ -289,9 +289,16 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,struct request_queue *q =bdev_get_queue (where->bdev);unsigned short logical_block_size =queue_logical_block_size (q);sector_t num_sectors; +unsigned int uninitialized_var (special_cmd_max_sectors ); -/* Reject unsupported discard requests */ -if ((rw &REQ_DISCARD ) && !blk_queue_discard (q)) { +/* +* Reject unsupported discard and write same requests. +*/ +if (rw &REQ_DISCARD ) + special_cmd_max_sectors = q->limits.max_discard_sectors; +else if (rw &REQ_WRITE_SAME ) + special_cmd_max_sectors = q->limits.max_write_same_sectors; +if ((rw & (REQ_DISCARD |REQ_WRITE_SAME )) && special_cmd_max_sectors ==0 ) {dec_count (io, region, -EOPNOTSUPP );return ; }
@@ -317,7 +324,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,store_io_and_region_in_bio (bio, io, region);if (rw &REQ_DISCARD ) { - num_sectors =min_t (sector_t, q->limits.max_discard_sectors, remaining); + num_sectors =min_t (sector_t, special_cmd_max_sectors, remaining); bio->bi_iter.bi_size = num_sectors <<SECTOR_SHIFT ; remaining -= num_sectors; }else if (rw &REQ_WRITE_SAME ) {
@@ -326,7 +333,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,*/ dp->get_page (dp, &page, &len, &offset);bio_add_page (bio, page, logical_block_size, offset); - num_sectors =min_t (sector_t, q->limits.max_write_same_sectors, remaining); + num_sectors =min_t (sector_t, special_cmd_max_sectors, remaining); bio->bi_iter.bi_size = num_sectors <<SECTOR_SHIFT ; offset =0 ;
drivers/md/dm-snap.c +109 -11
223 lines not on this page · raw message
drivers/md/dm-thin.c +0 -11
@@ -2357,17 +2357,6 @@ static int thin_bio_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_REMAPPED ;case -ENODATA : -if (get_pool_mode (tc->pool) ==PM_READ_ONLY ) { -/* -* This block isn't provisioned, and we have no way -* of doing so. -*/ -handle_unserviceable_bio (tc->pool, bio); -cell_defer_no_holder (tc, virt_cell); -return DM_MAPIO_SUBMITTED ; - } -/* fall through */ -case -EWOULDBLOCK :thin_defer_cell (tc, virt_cell);return DM_MAPIO_SUBMITTED ;
drivers/md/dm.c +21 -0
@@ -2507,6 +2507,19 @@ void dm_get(struct mapped_device *md)BUG_ON (test_bit (DMF_FREEING , &md->flags)); } +int dm_hold (struct mapped_device *md) +{ +spin_lock (&_minor_lock); +if (test_bit (DMF_FREEING , &md->flags)) { +spin_unlock (&_minor_lock); +return -EBUSY ; + } +dm_get (md); +spin_unlock (&_minor_lock); +return 0 ; +} +EXPORT_SYMBOL_GPL (dm_hold); +const char *dm_device_name (struct mapped_device *md) {return md->name;
@@ -2526,10 +2539,16 @@ static void __dm_destroy(struct mapped_device *md, bool wait)set_bit (DMF_FREEING , &md->flags);spin_unlock (&_minor_lock); +/* +* Take suspend_lock so that presuspend and postsuspend methods +* do not race with internal suspend. +*/ +mutex_lock (&md->suspend_lock);if (!dm_suspended_md (md)) {dm_table_presuspend_targets (map);dm_table_postsuspend_targets (map); } +mutex_unlock (&md->suspend_lock);/* dm_put_live_table must be before msleep, otherwise deadlock is possible */ dm_put_live_table (md, srcu_idx);
@@ -3001,6 +3020,7 @@ void dm_internal_suspend_fast(struct mapped_device *md)flush_workqueue (md->wq);dm_wait_for_completion (md,TASK_UNINTERRUPTIBLE ); } +EXPORT_SYMBOL_GPL (dm_internal_suspend_fast);void dm_internal_resume_fast (struct mapped_device *md) {
@@ -3012,6 +3032,7 @@ void dm_internal_resume_fast(struct mapped_device *md) done:mutex_unlock (&md->suspend_lock); } +EXPORT_SYMBOL_GPL (dm_internal_resume_fast);/*----------------------------------------------------------------- * Event notification.
drivers/mfd/kempld-core.c +1 -1
@@ -739,7 +739,7 @@ static int __init kempld_init(void)for (id = kempld_dmi_table; id->matches[0 ].slot !=DMI_NONE ; id++)if (strstr (id->ident, force_device_id)) -if (id->callback && id->callback (id)) +if (id->callback && !id->callback (id))break ;if (id->matches[0 ].slot ==DMI_NONE )return -ENODEV ;
drivers/net/ethernet/amd/pcnet32.c +29 -2
@@ -1543,7 +1543,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) {struct pcnet32_private *lp;int i, media; -int fdx, mii, fset, dxsuflo; +int fdx, mii, fset, dxsuflo, sram;int chip_version;char *chipname;struct net_device *dev;
@@ -1580,7 +1580,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) }/* initialize variables */ - fdx = mii = fset = dxsuflo =0 ; + fdx = mii = fset = dxsuflo = sram =0 ; chip_version = (chip_version >>12 ) &0xffff ;switch (chip_version) {
@@ -1613,6 +1613,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) chipname ="PCnet/FAST III 79C973" ;/* PCI */ fdx =1 ; mii =1 ; + sram =1 ;break ;case 0x2626 : chipname ="PCnet/Home 79C978" ;/* PCI */
@@ -1636,6 +1637,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) chipname ="PCnet/FAST III 79C975" ;/* PCI */ fdx =1 ; mii =1 ; + sram =1 ;break ;case 0x2628 : chipname ="PCnet/PRO 79C976" ;
@@ -1664,6 +1666,31 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) dxsuflo =1 ; } +/* +* The Am79C973/Am79C975 controllers come with 12K of SRAM +* which we can use for the Tx/Rx buffers but most importantly, +* the use of SRAM allow us to use the BCR18:NOUFLO bit to avoid +* Tx fifo underflows. +*/ +if (sram) { +/* +* The SRAM is being configured in two steps. First we +* set the SRAM size in the BCR25:SRAM_SIZE bits. According +* to the datasheet, each bit corresponds to a 512-byte +* page so we can have at most 24 pages. The SRAM_SIZE +* holds the value of the upper 8 bits of the 16-bit SRAM size. +* The low 8-bits start at 0x00 and end at 0xff. So the +* address range is from 0x0000 up to 0x17ff. Therefore, +* the SRAM_SIZE is set to 0x17. The next step is to set +* the BCR26:SRAM_BND midway through so the Tx and Rx +* buffers can share the SRAM equally. +*/ + a->write_bcr (ioaddr,25 ,0x17 ); + a->write_bcr (ioaddr,26 ,0xc ); +/* And finally enable the NOUFLO bit */ + a->write_bcr (ioaddr,18 , a->read_bcr (ioaddr,18 ) | (1 <<11 )); + } + dev =alloc_etherdev (sizeof (*lp));if (!dev) { ret = -ENOMEM ;
drivers/net/wireless/brcm80211/brcmfmac/vendor.c +12 -3
@@ -39,13 +39,22 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,void *dcmd_buf =NULL , *wr_pointer;u16 msglen, maxmsglen =PAGE_SIZE -0x100 ; -brcmf_dbg (TRACE ,"cmd %x set %d len %d\n" , cmdhdr->cmd, cmdhdr->set, - cmdhdr->len); +if (len <sizeof (*cmdhdr)) { +brcmf_err ("vendor command too short: %d\n" , len); +return -EINVAL ; + } vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); ifp = vif->ifp; - len -=sizeof (struct brcmf_vndr_dcmd_hdr ); +brcmf_dbg (TRACE ,"ifidx=%d, cmd=%d\n" , ifp->ifidx, cmdhdr->cmd); + +if (cmdhdr->offset > len) { +brcmf_err ("bad buffer offset %d > %d\n" , cmdhdr->offset, len); +return -EINVAL ; + } + + len -= cmdhdr->offset; ret_len = cmdhdr->len;if (ret_len >0 || len >0 ) {if (len >BRCMF_DCMD_MAXLEN ) {
drivers/net/wireless/iwlwifi/iwl-1000.c +4 -2
@@ -95,7 +95,8 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { .nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION, \ .base_params = &iwl1000_base_params, \ .eeprom_params = &iwl1000_eeprom_params, \ - .led_mode = IWL_LED_BLINK + .led_mode = IWL_LED_BLINK, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl1000_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 1000 BGN" ,
@@ -121,7 +122,8 @@ const struct iwl_cfg iwl1000_bg_cfg = { .base_params = &iwl1000_base_params, \ .eeprom_params = &iwl1000_eeprom_params, \ .led_mode = IWL_LED_RF_STATE, \ - .rx_with_siso_diversity = true + .rx_with_siso_diversity = true, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl100_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 100 BGN" ,
drivers/net/wireless/iwlwifi/iwl-2000.c +9 -4
@@ -123,7 +123,9 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { .nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ .base_params = &iwl2000_base_params, \ .eeprom_params = &iwl20x0_eeprom_params, \ - .led_mode = IWL_LED_RF_STATE + .led_mode = IWL_LED_RF_STATE, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K +const struct iwl_cfg iwl2000_2bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 2200 BGN" ,
@@ -149,7 +151,8 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { .nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ .base_params = &iwl2030_base_params, \ .eeprom_params = &iwl20x0_eeprom_params, \ - .led_mode = IWL_LED_RF_STATE + .led_mode = IWL_LED_RF_STATE, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64Kconst struct iwl_cfg iwl2030_2bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 2230 BGN" ,
@@ -170,7 +173,8 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { .base_params = &iwl2000_base_params, \ .eeprom_params = &iwl20x0_eeprom_params, \ .led_mode = IWL_LED_RF_STATE, \ - .rx_with_siso_diversity = true + .rx_with_siso_diversity = true, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl105_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 105 BGN" ,
@@ -197,7 +201,8 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { .base_params = &iwl2030_base_params, \ .eeprom_params = &iwl20x0_eeprom_params, \ .led_mode = IWL_LED_RF_STATE, \ - .rx_with_siso_diversity = true + .rx_with_siso_diversity = true, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl135_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 135 BGN" ,
drivers/net/wireless/iwlwifi/iwl-5000.c +4 -2
@@ -93,7 +93,8 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { .nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION, \ .base_params = &iwl5000_base_params, \ .eeprom_params = &iwl5000_eeprom_params, \ - .led_mode = IWL_LED_BLINK + .led_mode = IWL_LED_BLINK, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl5300_agn_cfg = { .name ="Intel(R) Ultimate N WiFi Link 5300 AGN" ,
@@ -158,7 +159,8 @@ const struct iwl_cfg iwl5350_agn_cfg = { .base_params = &iwl5000_base_params, \ .eeprom_params = &iwl5000_eeprom_params, \ .led_mode = IWL_LED_BLINK, \ - .internal_wimax_coex = true + .internal_wimax_coex = true, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl5150_agn_cfg = { .name ="Intel(R) WiMAX/WiFi Link 5150 AGN" ,
drivers/net/wireless/iwlwifi/iwl-6000.c +12 -6
@@ -145,7 +145,8 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = { .nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION, \ .base_params = &iwl6000_g2_base_params, \ .eeprom_params = &iwl6000_eeprom_params, \ - .led_mode = IWL_LED_RF_STATE + .led_mode = IWL_LED_RF_STATE, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64Kconst struct iwl_cfg iwl6005_2agn_cfg = { .name ="Intel(R) Centrino(R) Advanced-N 6205 AGN" ,
@@ -199,7 +200,8 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = { .nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION, \ .base_params = &iwl6000_g2_base_params, \ .eeprom_params = &iwl6000_eeprom_params, \ - .led_mode = IWL_LED_RF_STATE + .led_mode = IWL_LED_RF_STATE, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64Kconst struct iwl_cfg iwl6030_2agn_cfg = { .name ="Intel(R) Centrino(R) Advanced-N 6230 AGN" ,
@@ -235,7 +237,8 @@ const struct iwl_cfg iwl6030_2bg_cfg = { .nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION, \ .base_params = &iwl6000_g2_base_params, \ .eeprom_params = &iwl6000_eeprom_params, \ - .led_mode = IWL_LED_RF_STATE + .led_mode = IWL_LED_RF_STATE, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64Kconst struct iwl_cfg iwl6035_2agn_cfg = { .name ="Intel(R) Centrino(R) Advanced-N 6235 AGN" ,
@@ -290,7 +293,8 @@ const struct iwl_cfg iwl130_bg_cfg = { .nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION, \ .base_params = &iwl6000_base_params, \ .eeprom_params = &iwl6000_eeprom_params, \ - .led_mode = IWL_LED_BLINK + .led_mode = IWL_LED_BLINK, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl6000i_2agn_cfg = { .name ="Intel(R) Centrino(R) Advanced-N 6200 AGN" ,
@@ -322,7 +326,8 @@ const struct iwl_cfg iwl6000i_2bg_cfg = { .base_params = &iwl6050_base_params, \ .eeprom_params = &iwl6000_eeprom_params, \ .led_mode = IWL_LED_BLINK, \ - .internal_wimax_coex = true + .internal_wimax_coex = true, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl6050_2agn_cfg = { .name ="Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN" ,
@@ -347,7 +352,8 @@ const struct iwl_cfg iwl6050_2abg_cfg = { .base_params = &iwl6050_base_params, \ .eeprom_params = &iwl6000_eeprom_params, \ .led_mode = IWL_LED_BLINK, \ - .internal_wimax_coex = true + .internal_wimax_coex = true, \ + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K const struct iwl_cfg iwl6150_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN" ,
drivers/net/wireless/iwlwifi/mvm/coex.c +2 -1
@@ -793,7 +793,8 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,if (!vif->bss_conf.assoc) smps_mode =IEEE80211_SMPS_AUTOMATIC ; -if (IWL_COEX_IS_RRC_ON (mvm->last_bt_notif.ttc_rrc_status, +if (mvmvif->phy_ctxt && +IWL_COEX_IS_RRC_ON (mvm->last_bt_notif.ttc_rrc_status, mvmvif->phy_ctxt->id)) smps_mode =IEEE80211_SMPS_AUTOMATIC ;
drivers/net/wireless/iwlwifi/mvm/coex_legacy.c +2 -1
@@ -832,7 +832,8 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,if (!vif->bss_conf.assoc) smps_mode =IEEE80211_SMPS_AUTOMATIC ; -if (data->notif->rrc_enabled &BIT (mvmvif->phy_ctxt->id)) +if (mvmvif->phy_ctxt && + data->notif->rrc_enabled &BIT (mvmvif->phy_ctxt->id)) smps_mode =IEEE80211_SMPS_AUTOMATIC ; IWL_DEBUG_COEX(data->mvm,
drivers/net/wireless/iwlwifi/mvm/rs.c +14 -7
@@ -146,9 +146,12 @@ enum rs_column_mode {#define MAX_NEXT_COLUMNS 7#define MAX_COLUMN_CHECKS 3 +struct rs_tx_column ; +typedef bool (*allow_column_func_t ) (struct iwl_mvm *mvm,struct ieee80211_sta *sta, -struct iwl_scale_tbl_info *tbl); +struct iwl_scale_tbl_info *tbl, +const struct rs_tx_column *next_col);struct rs_tx_column {enum rs_column_mode mode;
@@ -159,13 +162,15 @@ struct rs_tx_column { };static bool rs_ant_allow (struct iwl_mvm *mvm,struct ieee80211_sta *sta, -struct iwl_scale_tbl_info *tbl) +struct iwl_scale_tbl_info *tbl, +const struct rs_tx_column *next_col) { -return iwl_mvm_bt_coex_is_ant_avail (mvm, tbl->rate.ant); +return iwl_mvm_bt_coex_is_ant_avail (mvm, next_col->ant); }static bool rs_mimo_allow (struct iwl_mvm *mvm,struct ieee80211_sta *sta, -struct iwl_scale_tbl_info *tbl) +struct iwl_scale_tbl_info *tbl, +const struct rs_tx_column *next_col) {if (!sta->ht_cap.ht_supported)return false;
@@ -183,7 +188,8 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, }static bool rs_siso_allow (struct iwl_mvm *mvm,struct ieee80211_sta *sta, -struct iwl_scale_tbl_info *tbl) +struct iwl_scale_tbl_info *tbl, +const struct rs_tx_column *next_col) {if (!sta->ht_cap.ht_supported)return false;
@@ -192,7 +198,8 @@ static bool rs_siso_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, }static bool rs_sgi_allow (struct iwl_mvm *mvm,struct ieee80211_sta *sta, -struct iwl_scale_tbl_info *tbl) +struct iwl_scale_tbl_info *tbl, +const struct rs_tx_column *next_col) {struct rs_rate *rate = &tbl->rate;struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
@@ -1594,7 +1601,7 @@ static enum rs_column rs_get_next_column(struct iwl_mvm *mvm,for (j =0 ; j <MAX_COLUMN_CHECKS ; j++) { allow_func = next_col->checks[j]; -if (allow_func && !allow_func (mvm, sta, tbl)) +if (allow_func && !allow_func (mvm, sta, tbl, next_col))break ; }
drivers/net/wireless/iwlwifi/mvm/time-event.c +3 -6
@@ -750,8 +750,7 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm)* request */ list_for_each_entry (te_data, &mvm->time_event_list, list) { -if (te_data->vif->type ==NL80211_IFTYPE_P2P_DEVICE && - te_data->running) { +if (te_data->vif->type ==NL80211_IFTYPE_P2P_DEVICE ) { mvmvif =iwl_mvm_vif_from_mac80211 (te_data->vif); is_p2p = true; goto remove_te;
@@ -766,10 +765,8 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm)* request */ list_for_each_entry (te_data, &mvm->aux_roc_te_list, list) { -if (te_data->running) { - mvmvif =iwl_mvm_vif_from_mac80211 (te_data->vif); - goto remove_te; - } + mvmvif =iwl_mvm_vif_from_mac80211 (te_data->vif); + goto remove_te; } remove_te:
drivers/net/wireless/rtlwifi/base.c +5 -2
@@ -1314,8 +1314,11 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) }return true; - }else if (0x86DD == ether_type) { -return true; + }else if (ETH_P_IPV6 == ether_type) { +/* TODO: Handle any IPv6 cases that need special handling. +* For now, always return false +*/ + goto end; } end:
drivers/of/irq.c +7 -3
@@ -290,7 +290,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_arstruct device_node *p;const __be32 *intspec, *tmp, *addr;u32 intsize, intlen; -int i, res = -EINVAL ; +int i, res;pr_debug ("of_irq_parse_one: dev=%s, index=%d\n" ,of_node_full_name (device), index);
@@ -323,15 +323,19 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar/* Get size of interrupt specifier */ tmp =of_get_property (p,"#interrupt-cells" ,NULL ); -if (tmp ==NULL ) +if (tmp ==NULL ) { + res = -EINVAL ; goto out; + } intsize =be32_to_cpu (*tmp);pr_debug (" intsize=%d intlen=%d\n" , intsize, intlen);/* Check index */ -if ((index +1 ) * intsize > intlen) +if ((index +1 ) * intsize > intlen) { + res = -EINVAL ; goto out; + }/* Copy intspec into irq structure */ intspec += index * intsize;
drivers/phy/phy-core.c +3 -1
@@ -52,7 +52,9 @@ static void devm_phy_consume(struct device *dev, void *res)static int devm_phy_match (struct device *dev,void *res,void *match_data) { -return res == match_data; +struct phy **phy = res; + +return *phy == match_data; }/**
drivers/powercap/intel_rapl.c +39 -15
169 lines not on this page · raw message
drivers/regulator/palmas-regulator.c +4 -0
@@ -1572,6 +1572,10 @@ static int palmas_regulators_probe(struct platform_device *pdev)if (!pmic)return -ENOMEM ; +if (of_device_is_compatible (node,"ti,tps659038-pmic" )) + palmas_generic_regs_info[PALMAS_REG_REGEN2 ].ctrl_addr = +TPS659038_REGEN2_CTRL ; + pmic->dev = &pdev->dev; pmic->palmas = palmas; palmas->pmic = pmic;
drivers/scsi/qla2xxx/tcm_qla2xxx.c +1 -1
@@ -1598,7 +1598,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(/* * Finally register the new FC Nexus with TCM */ -__transport_register_session (se_nacl->se_tpg, se_nacl, se_sess, sess); +transport_register_session (se_nacl->se_tpg, se_nacl, se_sess, sess);return 0 ; }
drivers/spi/spi-dw-mid.c +4 -2
@@ -108,7 +108,8 @@ static void dw_spi_dma_tx_done(void *arg) {struct dw_spi *dws = arg; -if (test_and_clear_bit (TX_BUSY , &dws->dma_chan_busy) &BIT (RX_BUSY )) +clear_bit (TX_BUSY , &dws->dma_chan_busy); +if (test_bit (RX_BUSY , &dws->dma_chan_busy))return ;dw_spi_xfer_done (dws); }
@@ -156,7 +157,8 @@ static void dw_spi_dma_rx_done(void *arg) {struct dw_spi *dws = arg; -if (test_and_clear_bit (RX_BUSY , &dws->dma_chan_busy) &BIT (TX_BUSY )) +clear_bit (RX_BUSY , &dws->dma_chan_busy); +if (test_bit (TX_BUSY , &dws->dma_chan_busy))return ;dw_spi_xfer_done (dws); }
drivers/spi/spi-qup.c +5 -4
@@ -489,7 +489,7 @@ static int spi_qup_probe(struct platform_device *pdev)struct resource *res;struct device *dev;void __iomem *base; -u32 max_freq, iomode; +u32 max_freq, iomode, num_cs;int ret, irq, size; dev = &pdev->dev;
@@ -541,10 +541,11 @@ static int spi_qup_probe(struct platform_device *pdev) }/* use num-cs unless not present or out of range */ -if (of_property_read_u16 (dev->of_node,"num-cs" , - &master->num_chipselect) || - (master->num_chipselect >SPI_NUM_CHIPSELECTS )) +if (of_property_read_u32 (dev->of_node,"num-cs" , &num_cs) || + num_cs >SPI_NUM_CHIPSELECTS ) master->num_chipselect =SPI_NUM_CHIPSELECTS ; +else + master->num_chipselect = num_cs; master->bus_num = pdev->id; master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH |SPI_LOOP ;
drivers/spi/spi.c +3 -2
@@ -1073,13 +1073,14 @@ void spi_finalize_current_message(struct spi_master *master) "failed to unprepare message: %d\n", ret); } } + +trace_spi_message_done (mesg); + master->cur_msg_prepared = false; mesg->state =NULL ;if (mesg->complete) mesg->complete (mesg->context); - -trace_spi_message_done (mesg); }EXPORT_SYMBOL_GPL (spi_finalize_current_message);
drivers/staging/vt6655/device_main.c +6 -10
@@ -357,16 +357,6 @@ static void device_init_registers(struct vnt_private *pDevice)/* zonetype initial */ pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE ]; -/* Get RFType */ - pDevice->byRFType =SROMbyReadEmbedded (pDevice->PortOffset,EEP_OFS_RFTYPE ); - -/* force change RevID for VT3253 emu */ -if ((pDevice->byRFType &RF_EMU ) !=0 ) - pDevice->byRevId =0x80 ; - - pDevice->byRFType &=RF_MASK ; -pr_debug ("pDevice->byRFType = %x\n" , pDevice->byRFType); -if (!pDevice->bZoneRegExist) pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE ];
@@ -1806,6 +1796,12 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)MACvInitialize (priv->PortOffset);MACvReadEtherAddress (priv->PortOffset, priv->abyCurrentNetAddr); +/* Get RFType */ + priv->byRFType =SROMbyReadEmbedded (priv->PortOffset,EEP_OFS_RFTYPE ); + priv->byRFType &=RF_MASK ; + +dev_dbg (&pcid->dev,"RF Type = %x\n" , priv->byRFType); +device_get_options (priv);device_set_options (priv);/* Mask out the options cannot be set to the chip */
drivers/staging/vt6655/rf.c +1 -0
@@ -791,6 +791,7 @@ bool RFbSetPower(break ;case RATE_6M :case RATE_9M : +case RATE_12M :case RATE_18M : byPwr = priv->abyOFDMPwrTbl[uCH];if (priv->byRFType ==RF_UW2452 )
drivers/staging/vt6656/rf.c +1 -0
@@ -640,6 +640,7 @@ int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel)break ;case RATE_6M :case RATE_9M : +case RATE_12M :case RATE_18M :case RATE_24M :case RATE_36M :
drivers/target/tcm_fc/tfc_io.c +2 -1
@@ -359,7 +359,7 @@ void ft_invl_hw_context(struct ft_cmd *cmd) ep =fc_seq_exch (seq);if (ep) { lport = ep->lp; -if (lport && (ep->xid <= lport->lro_xid)) +if (lport && (ep->xid <= lport->lro_xid)) {/* * "ddp_done" trigger invalidation of HW * specific DDP context
@@ -374,6 +374,7 @@ void ft_invl_hw_context(struct ft_cmd *cmd)* identified using ep->xid) */ cmd->was_ddp_setup =0 ; + } } } }
drivers/usb/chipidea/udc.c +11 -0
@@ -929,6 +929,13 @@ __acquires(hwep->lock)return retval; } +static int otg_a_alt_hnp_support (struct ci_hdrc *ci) +{ +dev_warn (&ci->gadget.dev, +"connect the device to an alternate port if you want HNP\n" ); +return isr_setup_status_phase (ci); +} +/** * isr_setup_packet_handler: setup packet handler * @ci: UDC descriptor
@@ -1061,6 +1068,10 @@ __acquires(ci->lock) ci); }break ; +case USB_DEVICE_A_ALT_HNP_SUPPORT : +if (ci_otg_is_fsm_mode (ci)) + err =otg_a_alt_hnp_support (ci); +break ;default : goto delegate; }
drivers/usb/common/usb-otg-fsm.c +2 -2
@@ -150,9 +150,9 @@ static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)break ;case OTG_STATE_B_PERIPHERAL :otg_chrg_vbus (fsm,0 ); -otg_loc_conn (fsm,1 );otg_loc_sof (fsm,0 );otg_set_protocol (fsm,PROTO_GADGET ); +otg_loc_conn (fsm,1 );break ;case OTG_STATE_B_WAIT_ACON :otg_chrg_vbus (fsm,0 );
@@ -213,10 +213,10 @@ static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)break ;case OTG_STATE_A_PERIPHERAL : -otg_loc_conn (fsm,1 );otg_loc_sof (fsm,0 );otg_set_protocol (fsm,PROTO_GADGET );otg_drv_vbus (fsm,1 ); +otg_loc_conn (fsm,1 );otg_add_timer (fsm,A_BIDL_ADIS );break ;case OTG_STATE_A_WAIT_VFALL :
drivers/usb/phy/phy-am335x-control.c +3 -0
@@ -126,6 +126,9 @@ struct phy_control *am335x_get_phy_control(struct device *dev)return NULL ; dev =bus_find_device (&platform_bus_type,NULL , node, match); +if (!dev) +return NULL ; + ctrl_usb =dev_get_drvdata (dev);if (!ctrl_usb)return NULL ;
drivers/usb/storage/unusual_uas.h +7 -0
@@ -113,6 +113,13 @@ UNUSUAL_DEV(0x0bc2, 0xab2a, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_ATA_1X), +/* Reported-by: Benjamin Tissoires <[email protected]> */ +UNUSUAL_DEV (0x13fd ,0x3940 ,0x0000 ,0x9999 , +"Initio Corporation" , +"" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_ATA_1X ), +/* Reported-by: Tom Arild Naess <[email protected]> */ UNUSUAL_DEV(0x152d, 0x0539, 0x0000, 0x9999, "JMicron",
drivers/virtio/virtio_balloon.c +16 -5
@@ -29,6 +29,7 @@#include <linux/module.h> #include <linux/balloon_compaction.h> #include <linux/oom.h> +#include <linux/wait.h> /* * Balloon device works in 4K page units. So each page is pointed to by
@@ -335,17 +336,25 @@ static int virtballoon_oom_notify(struct notifier_block *self,static int balloon (void *_vballoon) {struct virtio_balloon *vb = _vballoon; +DEFINE_WAIT_FUNC (wait, woken_wake_function);set_freezable ();while (!kthread_should_stop ()) {s64 diff;try_to_freeze (); -wait_event_interruptible (vb->config_change, - (diff =towards_target (vb)) !=0 - || vb->need_stats_update - ||kthread_should_stop () - ||freezing (current)); + +add_wait_queue (&vb->config_change, &wait); +for (;;) { +if ((diff =towards_target (vb)) !=0 || + vb->need_stats_update || +kthread_should_stop () || +freezing (current)) +break ; +wait_woken (&wait,TASK_INTERRUPTIBLE ,MAX_SCHEDULE_TIMEOUT ); + } +remove_wait_queue (&vb->config_change, &wait); +if (vb->need_stats_update)stats_handle_request (vb);if (diff >0 )
@@ -494,6 +503,8 @@ static int virtballoon_probe(struct virtio_device *vdev)if (err <0 ) goto out_oom_notify; +virtio_device_ready (vdev); + vb->thread =kthread_run (balloon, vb,"vballoon" );if (IS_ERR (vb->thread)) { err =PTR_ERR (vb->thread);
fs/hfsplus/brec.c +11 -9
@@ -131,13 +131,16 @@ skip:hfs_bnode_write (node, entry, data_off + key_len, entry_len);hfs_bnode_dump (node); -if (new_node) { -/* update parent key if we inserted a key -* at the start of the first node -*/ -if (!rec && new_node != node) -hfs_brec_update_parent (fd); +/* +* update parent key if we inserted a key +* at the start of the node and it is not the new node +*/ +if (!rec && new_node != node) { +hfs_bnode_read_key (node, fd->search_key, data_off + size); +hfs_brec_update_parent (fd); + } +if (new_node) {hfs_bnode_put (fd->bnode);if (!new_node->parent) {hfs_btree_inc_height (tree);
@@ -168,9 +171,6 @@ skip: goto again; } -if (!rec) -hfs_brec_update_parent (fd); -return 0 ; }
@@ -370,6 +370,8 @@ again:if (IS_ERR (parent))return PTR_ERR (parent);__hfs_brec_find (parent, fd, hfs_find_rec_by_key); +if (fd->record <0 ) +return -ENOENT ;hfs_bnode_dump (parent); rec = fd->record;
include/linux/device-mapper.h +1 -0
@@ -368,6 +368,7 @@ int dm_create(int minor, struct mapped_device **md);*/ struct mapped_device *dm_get_md (dev_t dev);void dm_get (struct mapped_device *md); +int dm_hold (struct mapped_device *md);void dm_put (struct mapped_device *md);/*
include/linux/mfd/palmas.h +3 -0
@@ -2999,6 +2999,9 @@ enum usb_irq_events {#define PALMAS_GPADC_TRIM15 0x0E#define PALMAS_GPADC_TRIM16 0x0F +/* TPS659038 regen2_ctrl offset iss different from palmas */ +#define TPS659038_REGEN2_CTRL 0x12 +/* TPS65917 Interrupt registers */ /* Registers for function INTERRUPT */
include/trace/events/regmap.h +61 -62
280 lines not on this page · raw message
kernel/events/core.c +10 -0
@@ -4412,6 +4412,13 @@ static void perf_pending_event(struct irq_work *entry) {struct perf_event *event =container_of (entry, struct perf_event, pending); +int rctx; + + rctx =perf_swevent_get_recursion_context (); +/* +* If we 'fail' here, that's OK, it means recursion is already disabled +* and we won't recurse 'further'. +*/ if (event->pending_disable) { event->pending_disable =0 ;
@@ -4422,6 +4429,9 @@ static void perf_pending_event(struct irq_work *entry) event->pending_wakeup =0 ;perf_event_wakeup (event); } + +if (rctx >=0 ) +perf_swevent_put_recursion_context (rctx); }/*
net/mac80211/ieee80211_i.h +17 -6
@@ -58,13 +58,24 @@ struct ieee80211_local;#define IEEE80211_UNSET_POWER_LEVEL INT_MIN/* -* Some APs experience problems when working with U-APSD. Decrease the -* probability of that happening by using legacy mode for all ACs but VO. -* The AP that caused us trouble was a Cisco 4410N. It ignores our -* setting, and always treats non-VO ACs as legacy. +* Some APs experience problems when working with U-APSD. Decreasing the +* probability of that happening by using legacy mode for all ACs but VO isn't +* enough. +* +* Cisco 4410N originally forced us to enable VO by default only because it +* treated non-VO ACs as legacy. +* +* However some APs (notably Netgear R7000) silently reclassify packets to +* different ACs. Since u-APSD ACs require trigger frames for frame retrieval +* clients would never see some frames (e.g. ARP responses) or would fetch them +* accidentally after a long time. +* +* It makes little sense to enable u-APSD queues by default because it needs +* userspace applications to be aware of it to actually take advantage of the +* possible additional powersavings. Implicitly depending on driver autotrigger +* frame support doesn't make much sense. */ -#define IEEE80211_DEFAULT_UAPSD_QUEUES \ - IEEE80211_WMM_IE_STA_QOSINFO_AC_VO +#define IEEE80211_DEFAULT_UAPSD_QUEUES 0#define IEEE80211_DEFAULT_MAX_SP_LEN \ IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL
net/mac80211/rx.c +3 -0
@@ -2191,6 +2191,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) hdr = (struct ieee80211_hdr *) skb->data; mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); +if (ieee80211_drop_unencrypted (rx, hdr->frame_control)) +return RX_DROP_MONITOR ; +/* frame is in RMC, don't forward */ if (ieee80211_is_data(hdr->frame_control) && is_multicast_ether_addr(hdr->addr1) &&
net/mac80211/util.c +1 -1
@@ -3153,7 +3153,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, wdev_iter = &sdata_iter->wdev;if (sdata_iter == sdata || -rcu_access_pointer (sdata_iter->vif.chanctx_conf) ==NULL || + !ieee80211_sdata_running (sdata_iter) || local->hw.wiphy->software_iftypes &BIT (wdev_iter->iftype))continue ;
net/wireless/nl80211.c +10 -0
@@ -4360,6 +4360,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)if (parse_station_flags (info, dev->ieee80211_ptr->iftype, ¶ms))return -EINVAL ; +/* HT/VHT requires QoS, but if we don't have that just ignore HT/VHT +* as userspace might just pass through the capabilities from the IEs +* directly, rather than enforcing this restriction and returning an +* error in this case. +*/ +if (!(params.sta_flags_set &BIT (NL80211_STA_FLAG_WME ))) { + params.ht_capa =NULL ; + params.vht_capa =NULL ; + } +/* When you run into this, adjust the code below for the new flag */ BUILD_BUG_ON (NL80211_STA_FLAG_MAX !=7 );
sound/soc/codecs/adav80x.c +2 -2
@@ -317,7 +317,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct adav80x *adav80x =snd_soc_codec_get_drvdata (codec); -unsigned int deemph = ucontrol->value.enumerated.item[0 ]; +unsigned int deemph = ucontrol->value.integer.value[0 ];if (deemph >1 )return -EINVAL ;
@@ -333,7 +333,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct adav80x *adav80x =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = adav80x->deemph; + ucontrol->value.integer.value[0 ] = adav80x->deemph;return 0 ; };
sound/soc/codecs/ak4641.c +2 -2
@@ -76,7 +76,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct ak4641_priv *ak4641 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];if (deemph >1 )return -EINVAL ;
@@ -92,7 +92,7 @@ static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct ak4641_priv *ak4641 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = ak4641->deemph; + ucontrol->value.integer.value[0 ] = ak4641->deemph;return 0 ; };
sound/soc/codecs/ak4671.c +22 -22
65 lines not on this page · raw message
sound/soc/codecs/cs4271.c +2 -2
@@ -286,7 +286,7 @@ static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct cs4271_private *cs4271 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = cs4271->deemph; + ucontrol->value.integer.value[0 ] = cs4271->deemph;return 0 ; }
@@ -296,7 +296,7 @@ static int cs4271_put_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct cs4271_private *cs4271 =snd_soc_codec_get_drvdata (codec); - cs4271->deemph = ucontrol->value.enumerated.item[0 ]; + cs4271->deemph = ucontrol->value.integer.value[0 ];return cs4271_set_deemph (codec); }
sound/soc/codecs/da732x.c +4 -4
@@ -876,11 +876,11 @@ static const struct snd_soc_dapm_widget da732x_dapm_widgets[] = {static const struct snd_soc_dapm_route da732x_dapm_routes[] = {/* Inputs */ - {"AUX1L PGA" ,"NULL" ,"AUX1L" }, - {"AUX1R PGA" ,"NULL" ,"AUX1R" }, + {"AUX1L PGA" ,NULL ,"AUX1L" }, + {"AUX1R PGA" ,NULL ,"AUX1R" }, {"MIC1 PGA" ,NULL ,"MIC1" }, - {"MIC2 PGA" ,"NULL" ,"MIC2" }, - {"MIC3 PGA" ,"NULL" ,"MIC3" }, + {"MIC2 PGA" ,NULL ,"MIC2" }, + {"MIC3 PGA" ,NULL ,"MIC3" },/* Capture Path */ {"ADC1 Left MUX" ,"MIC1" ,"MIC1 PGA" },
sound/soc/codecs/es8328.c +2 -2
@@ -120,7 +120,7 @@ static int es8328_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct es8328_priv *es8328 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = es8328->deemph; + ucontrol->value.integer.value[0 ] = es8328->deemph;return 0 ; }
@@ -129,7 +129,7 @@ static int es8328_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct es8328_priv *es8328 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];int ret;if (deemph >1 )
sound/soc/codecs/pcm1681.c +2 -2
@@ -118,7 +118,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct pcm1681_private *priv =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = priv->deemph; + ucontrol->value.integer.value[0 ] = priv->deemph;return 0 ; }
@@ -129,7 +129,7 @@ static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct pcm1681_private *priv =snd_soc_codec_get_drvdata (codec); - priv->deemph = ucontrol->value.enumerated.item[0 ]; + priv->deemph = ucontrol->value.integer.value[0 ];return pcm1681_set_deemph (codec); }
sound/soc/codecs/sgtl5000.c +1 -7
@@ -1149,13 +1149,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)/* Enable VDDC charge pump */ ana_pwr |=SGTL5000_VDDC_CHRGPMP_POWERUP ; }else if (vddio >=3100 && vdda >=3100 ) { -/* -* if vddio and vddd > 3.1v, -* charge pump should be clean before set ana_pwr -*/ -snd_soc_update_bits (codec,SGTL5000_CHIP_ANA_POWER , -SGTL5000_VDDC_CHRGPMP_POWERUP ,0 ); - + ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP ;/* VDDC use VDDIO rail */ lreg_ctrl |=SGTL5000_VDDC_ASSN_OVRD ; lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<
sound/soc/codecs/sn95031.c +2 -2
@@ -531,8 +531,8 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = {/* speaker map */ { "IHFOUTL", NULL, "Speaker Rail"}, { "IHFOUTR", NULL, "Speaker Rail"}, - { "IHFOUTL", "NULL", "Speaker Left Playback"}, - { "IHFOUTR", "NULL", "Speaker Right Playback"}, + { "IHFOUTL", NULL, "Speaker Left Playback"}, + { "IHFOUTR", NULL, "Speaker Right Playback"}, { "Speaker Left Playback", NULL, "Speaker Left Filter"}, { "Speaker Right Playback", NULL, "Speaker Right Filter"}, { "Speaker Left Filter", NULL, "IHFDAC Left"},
sound/soc/codecs/tas5086.c +2 -2
@@ -281,7 +281,7 @@ static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct tas5086_private *priv =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = priv->deemph; + ucontrol->value.integer.value[0 ] = priv->deemph;return 0 ; }
@@ -292,7 +292,7 @@ static int tas5086_put_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct tas5086_private *priv =snd_soc_codec_get_drvdata (codec); - priv->deemph = ucontrol->value.enumerated.item[0 ]; + priv->deemph = ucontrol->value.integer.value[0 ];return tas5086_set_deemph (codec); }
sound/soc/codecs/wm2000.c +4 -4
@@ -610,7 +610,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm2000_priv *wm2000 =dev_get_drvdata (codec->dev); - ucontrol->value.enumerated.item[0 ] = wm2000->anc_active; + ucontrol->value.integer.value[0 ] = wm2000->anc_active;return 0 ; }
@@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm2000_priv *wm2000 =dev_get_drvdata (codec->dev); -int anc_active = ucontrol->value.enumerated.item[0 ]; +int anc_active = ucontrol->value.integer.value[0 ];int ret;if (anc_active >1 )
@@ -643,7 +643,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm2000_priv *wm2000 =dev_get_drvdata (codec->dev); - ucontrol->value.enumerated.item[0 ] = wm2000->spk_ena; + ucontrol->value.integer.value[0 ] = wm2000->spk_ena;return 0 ; }
@@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm2000_priv *wm2000 =dev_get_drvdata (codec->dev); -int val = ucontrol->value.enumerated.item[0 ]; +int val = ucontrol->value.integer.value[0 ];int ret;if (val >1 )
sound/soc/codecs/wm8731.c +2 -2
@@ -125,7 +125,7 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8731_priv *wm8731 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = wm8731->deemph; + ucontrol->value.integer.value[0 ] = wm8731->deemph;return 0 ; }
@@ -135,7 +135,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8731_priv *wm8731 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];int ret =0 ;if (deemph >1 )
sound/soc/codecs/wm8903.c +2 -2
@@ -442,7 +442,7 @@ static int wm8903_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8903_priv *wm8903 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = wm8903->deemph; + ucontrol->value.integer.value[0 ] = wm8903->deemph;return 0 ; }
@@ -452,7 +452,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8903_priv *wm8903 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];int ret =0 ;if (deemph >1 )
sound/soc/codecs/wm8904.c +2 -2
@@ -525,7 +525,7 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = wm8904->deemph; + ucontrol->value.integer.value[0 ] = wm8904->deemph;return 0 ; }
@@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];if (deemph >1 )return -EINVAL ;
sound/soc/codecs/wm8955.c +2 -2
@@ -393,7 +393,7 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8955_priv *wm8955 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = wm8955->deemph; + ucontrol->value.integer.value[0 ] = wm8955->deemph;return 0 ; }
@@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8955_priv *wm8955 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];if (deemph >1 )return -EINVAL ;
sound/soc/codecs/wm8960.c +2 -2
@@ -182,7 +182,7 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8960_priv *wm8960 =snd_soc_codec_get_drvdata (codec); - ucontrol->value.enumerated.item[0 ] = wm8960->deemph; + ucontrol->value.integer.value[0 ] = wm8960->deemph;return 0 ; }
@@ -191,7 +191,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, {struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct wm8960_priv *wm8960 =snd_soc_codec_get_drvdata (codec); -int deemph = ucontrol->value.enumerated.item[0 ]; +int deemph = ucontrol->value.integer.value[0 ];if (deemph >1 )return -EINVAL ;
sound/soc/codecs/wm9712.c +3 -3
@@ -180,7 +180,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,struct snd_soc_dapm_context *dapm =snd_soc_dapm_kcontrol_dapm (kcontrol);struct snd_soc_codec *codec =snd_soc_dapm_to_codec (dapm);struct wm9712_priv *wm9712 =snd_soc_codec_get_drvdata (codec); -unsigned int val = ucontrol->value.enumerated.item[0 ]; +unsigned int val = ucontrol->value.integer.value[0 ];struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;unsigned int mixer, mask, shift, old;
@@ -193,7 +193,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,mutex_lock (&wm9712->lock); old = wm9712->hp_mixer[mixer]; -if (ucontrol->value.enumerated.item[0 ]) +if (ucontrol->value.integer.value[0 ]) wm9712->hp_mixer[mixer] |= mask;else wm9712->hp_mixer[mixer] &= ~mask;
@@ -231,7 +231,7 @@ static int wm9712_hp_mixer_get(struct snd_kcontrol *kcontrol, mixer = mc->shift >>8 ; shift = mc->shift &0xff ; - ucontrol->value.enumerated.item[0 ] = + ucontrol->value.integer.value[0 ] = (wm9712->hp_mixer[mixer] >> shift) &1 ;return 0 ;
sound/soc/codecs/wm9713.c +3 -3
@@ -255,7 +255,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,struct snd_soc_dapm_context *dapm =snd_soc_dapm_kcontrol_dapm (kcontrol);struct snd_soc_codec *codec =snd_soc_dapm_to_codec (dapm);struct wm9713_priv *wm9713 =snd_soc_codec_get_drvdata (codec); -unsigned int val = ucontrol->value.enumerated.item[0 ]; +unsigned int val = ucontrol->value.integer.value[0 ];struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;unsigned int mixer, mask, shift, old;
@@ -268,7 +268,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,mutex_lock (&wm9713->lock); old = wm9713->hp_mixer[mixer]; -if (ucontrol->value.enumerated.item[0 ]) +if (ucontrol->value.integer.value[0 ]) wm9713->hp_mixer[mixer] |= mask;else wm9713->hp_mixer[mixer] &= ~mask;
@@ -306,7 +306,7 @@ static int wm9713_hp_mixer_get(struct snd_kcontrol *kcontrol, mixer = mc->shift >>8 ; shift = mc->shift &0xff ; - ucontrol->value.enumerated.item[0 ] = + ucontrol->value.integer.value[0 ] = (wm9713->hp_mixer[mixer] >> shift) &1 ;return 0 ;