diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-05 14:57:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-05 14:57:08 +0100 |
| commit | 67b81cc8984d159f42496ae0ea262e43af71ef5c (patch) | |
| tree | e41a3d2e3bb7a56c8c5fe665e62af99fdd3e413f | |
| parent | 20ee3bb0cee3b0d161e5afbbf3fcd65f5654c42c (diff) | |
| parent | 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
| -rw-r--r-- | drivers/hsi/clients/ssi_protocol.c | 1 | ||||
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c index 21f11a5b965b..7aacb19fd1ff 100644 --- a/drivers/hsi/clients/ssi_protocol.c +++ b/drivers/hsi/clients/ssi_protocol.c @@ -796,7 +796,6 @@ static void ssip_rx_strans(struct hsi_client *cl, u32 cmd) dev_err(&cl->device, "No memory for rx skb\n"); goto out1; } - skb->dev = ssi->netdev; skb_put(skb, len * 4); msg = ssip_alloc_data(ssi, skb, GFP_ATOMIC); if (unlikely(!msg)) { diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 44a3f5660c10..eb9820158318 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -524,6 +524,7 @@ static int ssi_probe(struct platform_device *pd) if (!childpdev) { err = -ENODEV; dev_err(&pd->dev, "failed to create ssi controller port\n"); + of_node_put(child); goto out3; } } |