diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-08-22 15:41:56 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-08-22 15:42:03 +0200 |
commit | 744f51e863462192727f9118642563d46fa81393 (patch) | |
tree | 43e87ed54550a523396283f126d81907e5c4e524 /sound/firewire | |
parent | 051c78af14fcd74a22b5af45548ad9d588247cc7 (diff) | |
parent | b8e4f1fdfa422398c2d6c47bfb7d1feb3046d70a (diff) | |
download | linux-744f51e863462192727f9118642563d46fa81393.tar.gz |
Merge branch 'topic/usb-validation' into for-next
Pull USB validation patches. It's based on the latest 5.3 development
branch, so we shall catch up the whole things.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r-- | sound/firewire/packets-buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/packets-buffer.c b/sound/firewire/packets-buffer.c index 0d35359d25cd..0ecafd0c6722 100644 --- a/sound/firewire/packets-buffer.c +++ b/sound/firewire/packets-buffer.c @@ -37,7 +37,7 @@ int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit, packets_per_page = PAGE_SIZE / packet_size; if (WARN_ON(!packets_per_page)) { err = -EINVAL; - goto error; + goto err_packets; } pages = DIV_ROUND_UP(count, packets_per_page); |