mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge remote-tracking branch 'sm8350/lineage-20' into lineage-22.2
* sm8350/lineage-20: UPSTREAM: perf/core: Fix potential NULL deref UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier() ANDROID: 16K: Allocate pad vma on the stack ANDROID: 16K: Don't copy data vma for maps/smaps output ANDROID: GKI: update Trimble symbol list UPSTREAM: net/sched: Always pass notifications when child class becomes empty Revert "drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling" Linux 5.4.296 net: ipv6: Discard next-hop MTU less than minimum link MTU x86/mm: Disable hugetlb page table sharing on 32-bit Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP Cameras HID: Add IGNORE quirk for SMARTLINKTECHNOLOGY vt: add missing notification when switching back to text mode net: usb: qmi_wwan: add SIMCom 8230C composition atm: idt77252: Add missing `dma_map_error()` bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT bnxt_en: Fix DCB ETS validation can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level net: phy: microchip: limit 100M workaround to link-down events on LAN88xx ... Change-Id: Ibded01585f3540b8c4ac285da2c131d7c55e549b
This commit is contained in:
commit
ec51464b3d
138 changed files with 2400 additions and 1623 deletions
|
|
@ -722,6 +722,10 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct
|
|||
change = nval != oval;
|
||||
snd_sb16_set_dma_mode(chip, nval);
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
if (change) {
|
||||
snd_dma_disable(chip->dma8);
|
||||
snd_dma_disable(chip->dma16);
|
||||
}
|
||||
return change;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev)
|
|||
struct hda_codec *codec = container_of(dev, struct hda_codec, core);
|
||||
|
||||
/* ignore unsol events during shutdown */
|
||||
if (codec->bus->shutdown)
|
||||
if (codec->card->shutdown || codec->bus->shutdown)
|
||||
return;
|
||||
|
||||
/* ignore unsol events during system suspend/resume */
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ static int meson_card_parse_of_optional(struct snd_soc_card *card,
|
|||
const char *p))
|
||||
{
|
||||
/* If property is not provided, don't fail ... */
|
||||
if (!of_property_read_bool(card->dev->of_node, propname))
|
||||
if (!of_property_present(card->dev->of_node, propname))
|
||||
return 0;
|
||||
|
||||
/* ... but do fail if it is provided and the parsing fails */
|
||||
|
|
|
|||
|
|
@ -982,6 +982,8 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,
|
|||
* and request Cluster Descriptor
|
||||
*/
|
||||
wLength = le16_to_cpu(hc_header.wLength);
|
||||
if (wLength < sizeof(cluster))
|
||||
return NULL;
|
||||
cluster = kzalloc(wLength, GFP_KERNEL);
|
||||
if (!cluster)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
|
|
|||
Loading…
Reference in a new issue