diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-05-23 07:48:16 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-05-23 07:48:27 +0200 |
| commit | 1212fa1b482ea09c19aed29001465799e85ea6c3 (patch) | |
| tree | ca70b299e420fbbfab8cb9780584f66b0652f8a8 /drivers/firewire/core-cdev.c | |
| parent | ALSA: usb-audio: Fix wrong kfree issue in snd_usb_endpoint_free_all (diff) | |
| parent | ALSA: usb-audio: Add missing ep_idx in fixed EP quirks (diff) | |
| download | linux-1212fa1b482ea09c19aed29001465799e85ea6c3.tar.xz linux-1212fa1b482ea09c19aed29001465799e85ea6c3.zip | |
Merge branch 'for-linus' into for-next
Merge for 5.18-rc1
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/firewire/core-cdev.c')
| -rw-r--r-- | drivers/firewire/core-cdev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 8e9670036e5c..c9fe5903725a 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1502,6 +1502,7 @@ static void outbound_phy_packet_callback(struct fw_packet *packet, { struct outbound_phy_packet_event *e = container_of(packet, struct outbound_phy_packet_event, p); + struct client *e_client; switch (status) { /* expected: */ @@ -1518,9 +1519,10 @@ static void outbound_phy_packet_callback(struct fw_packet *packet, } e->phy_packet.data[0] = packet->timestamp; + e_client = e->client; queue_event(e->client, &e->event, &e->phy_packet, sizeof(e->phy_packet) + e->phy_packet.length, NULL, 0); - client_put(e->client); + client_put(e_client); } static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg) |