Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[~andy/linux] / drivers / dma / amba-pl08x.c

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 8bad254a498d7788530e97a5e5599ca90a2aefe1..06fe45c74de57b3151e8520e9d7154f7ba7906e2 100644 (file)
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -299,8 +299,8 @@ static int pl08x_request_mux(struct pl08x_dma_chan *plchan)
        const struct pl08x_platform_data *pd = plchan->host->pd;
        int ret;
 
-       if (plchan->mux_use++ == 0 && pd->get_signal) {
-               ret = pd->get_signal(plchan->cd);
+       if (plchan->mux_use++ == 0 && pd->get_xfer_signal) {
+               ret = pd->get_xfer_signal(plchan->cd);
                if (ret < 0) {
                        plchan->mux_use = 0;
                        return ret;
@@ -318,8 +318,8 @@ static void pl08x_release_mux(struct pl08x_dma_chan *plchan)
        if (plchan->signal >= 0) {
                WARN_ON(plchan->mux_use == 0);
 
-               if (--plchan->mux_use == 0 && pd->put_signal) {
-                       pd->put_signal(plchan->cd, plchan->signal);
+               if (--plchan->mux_use == 0 && pd->put_xfer_signal) {
+                       pd->put_xfer_signal(plchan->cd, plchan->signal);
                        plchan->signal = -1;
                }
        }