diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:01:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:01:39 +1000 |
| commit | c2fefa46d1a046cac65a28c3a4ce71d7f0973dbf (patch) | |
| tree | e083cdbce5f904d2a29230c95bee99a566760c1c | |
| parent | 868c4813f34fdd0450e29d9777dbe0663f127bb3 (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; } } |