diff options
| author | Jakub Kicinski <[email protected]> | 2023-10-26 20:42:19 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-10-26 20:46:28 +0000 |
| commit | ec4c20ca09831ddba8fac10a7d82a9902e96e717 (patch) | |
| tree | e356e6fe760bebff03330bf6f21f0823b87854bd /sound/soc/dwc/dwc-i2s.c | |
| parent | bareudp: use ports to lookup route (diff) | |
| parent | Merge tag 'net-6.6-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-ec4c20ca09831ddba8fac10a7d82a9902e96e717.tar.gz kernel-ec4c20ca09831ddba8fac10a7d82a9902e96e717.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
net/mac80211/rx.c
91535613b609 ("wifi: mac80211: don't drop all unprotected public action frames")
6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value")
Adjacent changes:
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
61471264c018 ("net: ethernet: apm: Convert to platform remove callback returning void")
d2ca43f30611 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF")
net/vmw_vsock/virtio_transport.c
64c99d2d6ada ("vsock/virtio: support to send non-linear skb")
53b08c498515 ("vsock/virtio: initialize the_virtio_vsock before using VQs")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'sound/soc/dwc/dwc-i2s.c')
| -rw-r--r-- | sound/soc/dwc/dwc-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 22c004179214..9ea4be56d3b7 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -917,7 +917,7 @@ static int jh7110_i2stx0_clk_cfg(struct i2s_clk_config_data *config) static int dw_i2s_probe(struct platform_device *pdev) { - const struct i2s_platform_data *pdata = of_device_get_match_data(&pdev->dev); + const struct i2s_platform_data *pdata = pdev->dev.platform_data; struct dw_i2s_dev *dev; struct resource *res; int ret, irq; |