diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 08:46:23 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 08:46:23 -0700 |
commit | 5f63e885ac32429fc1340f5a61e1484022efc773 (patch) | |
tree | f9a21a6902e1857274775b96d561d8be17287860 /drivers/dma/bcm2835-dma.c | |
parent | b6d2d3289f84e9c7449dff04fb959e29207acd80 (diff) | |
parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
download | linux-5f63e885ac32429fc1340f5a61e1484022efc773.tar.gz |
Merge tag 'v4.0-rc7' into next
Sync up with Linux 4.0-rc7 to bring in ALPS changes.
Diffstat (limited to 'drivers/dma/bcm2835-dma.c')
-rw-r--r-- | drivers/dma/bcm2835-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 0723096fb50a..c92d6a70ccf3 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -475,6 +475,7 @@ static int bcm2835_dma_terminate_all(struct dma_chan *chan) * c->desc is NULL and exit.) */ if (c->desc) { + bcm2835_dma_desc_free(&c->desc->vd); c->desc = NULL; bcm2835_dma_abort(c->chan_base); |