fix DMA channel leaking

sandeepmistry · sandeepmistry · commit 7b3392a84aec · 2016-11-17T17:41:59.000-05:00
diff --git a/libraries/I2S/src/I2S.cpp b/libraries/I2S/src/I2S.cpp
@@ -112,7 +112,7 @@ int I2SClass::begin(int mode, long sampleRate, int bitsPerSample)
 
 void I2SClass::end()
 {
-  if (_dmaChannel > 0) {
+  if (_dmaChannel > -1) {
     DMA.freeChannel(_dmaChannel);
   }
 
diff --git a/libraries/I2S/src/utility/DMA.cpp b/libraries/I2S/src/utility/DMA.cpp
@@ -114,7 +114,7 @@ void DMAClass::freeChannel(int channel)
   DMAC->CHID.bit.ID = channel;
   DMAC->CHCTRLA.bit.ENABLE = 0;
 
-  _channelMask &= (1 << channel);
+  _channelMask &= ~(1 << channel);
 }
 
 void DMAClass::setPriorityLevel(int channel, int level)

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ int I2SClass::begin(int mode, long sampleRate, int bitsPerSample)`
`112`	`112`
`113`	`113`	`void I2SClass::end()`
`114`	`114`	`{`
`115`		`- if (_dmaChannel > 0) {`
	`115`	`+ if (_dmaChannel > -1) {`
`116`	`116`	`DMA.freeChannel(_dmaChannel);`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void DMAClass::freeChannel(int channel)`
`114`	`114`	`DMAC->CHID.bit.ID = channel;`
`115`	`115`	`DMAC->CHCTRLA.bit.ENABLE = 0;`
`116`	`116`
`117`		`- _channelMask &= (1 << channel);`
	`117`	`+ _channelMask &= ~(1 << channel);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`void DMAClass::setPriorityLevel(int channel, int level)`