diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-30 10:53:17 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-30 10:53:17 +0300 |
commit | b84a9523bab4a2483d7b7566b81a7859c2fd9a78 (patch) | |
tree | 10cdebd482fc53568e9f025e3f1e665451fb3cb1 /sound/pci/ctxfi/ctdaio.c | |
parent | 2a28e4d28ca1dcaf5073351517e9b22400994289 (diff) | |
parent | 1b4861e32e461b6fae14dc49ed0f1c7f20af5146 (diff) | |
download | linux-b84a9523bab4a2483d7b7566b81a7859c2fd9a78.tar.xz |
Merge v6.9.3
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci/ctxfi/ctdaio.c')
-rw-r--r-- | sound/pci/ctxfi/ctdaio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 7fc720046ce2..83aaf9441ef3 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -684,7 +684,7 @@ static int daio_mgr_commit_write(struct daio_mgr *mgr) return 0; } -int daio_mgr_create(struct hw *hw, struct daio_mgr **rdaio_mgr) +int daio_mgr_create(struct hw *hw, void **rdaio_mgr) { int err, i; struct daio_mgr *daio_mgr; @@ -738,8 +738,9 @@ error1: return err; } -int daio_mgr_destroy(struct daio_mgr *daio_mgr) +int daio_mgr_destroy(void *ptr) { + struct daio_mgr *daio_mgr = ptr; unsigned long flags; /* free daio input mapper list */ |