diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-06-10 13:42:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-06-10 13:42:16 +0200 |
| commit | 8e20329c9797fabc6c2cade73b4371509b58e18b (patch) | |
| tree | a893d996766bf57d6a27511586e33272fbb8c546 /sound/core/timer.c | |
| parent | b35e857e753c9291218ddd81b757817280541510 (diff) | |
| parent | 2b9e462d8dc2b13e6b5d9dc8c7ed95502c9718f5 (diff) | |
Merge 4.4.272 into android-4.4-p
Changes in 4.4.272
efi: cper: fix snprintf() use in cper_dimm_err_location()
vfio/pci: Fix error return code in vfio_ecap_init()
vfio/platform: fix module_put call in error flow
ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service
HID: pidff: fix error return code in hid_pidff_init()
netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches
ieee802154: fix error return code in ieee802154_add_iface()
ieee802154: fix error return code in ieee802154_llsec_getparams()
Bluetooth: fix the erroneous flush_work() order
Bluetooth: use correct lock to prevent UAF of hdev object
net: caif: added cfserl_release function
net: caif: add proper error handling
net: caif: fix memory leak in caif_device_notify
net: caif: fix memory leak in cfusbl_device_notify
ALSA: timer: Fix master timer notification
ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed
pid: take a reference when initializing `cad_pid`
ocfs2: fix data corruption by fallocate
nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect
btrfs: fixup error handling in fixup_inode_link_counts
KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode
arm64: Remove unimplemented syscall log message
xen-pciback: redo VF placement in the virtual topology
Linux 4.4.272
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0bc043dfa7733208cbd61362d947d9d505eda922
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index f989adb98a22..7e4509de01c4 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -432,9 +432,10 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) return; if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE) return; + event += 10; /* convert to SNDRV_TIMER_EVENT_MXXX */ list_for_each_entry(ts, &ti->slave_active_head, active_list) if (ts->ccallback) - ts->ccallback(ts, event + 100, &tstamp, resolution); + ts->ccallback(ts, event, &tstamp, resolution); } /* start/continue a master timer */ |