diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-22 21:22:59 +0400 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-22 21:22:59 +0400 |
| commit | 73d9cdca1ced6ab32be363b58699039bd82b062a (patch) | |
| tree | 72abb106516adf991b941b97ea4ed53c3294a8e9 | |
| parent | f8eb9e7d2a198fe3a0f76d9e5b374160c26e4621 (diff) | |
| download | linux-73d9cdca1ced6ab32be363b58699039bd82b062a.tar.xz | |
dma: mv_xor: fix error handling path
The ->probe() function of the mv_xor function contains in its error
handling code a loop to cleanup the XOR channels that had been
successfully initialized if some other XOR channel fails to be
initialized. It does that by traveling the list of XOR channels, and
cleanup those for which the pointer is not NULL.
However, since the mv_xor_channel_add() function return a PTR_ERR
style value, the pointer is not NULL on error. So, when handling the
error of a given channel initialization, we cleanup this channel
initialization and mark this channel entry as NULL in the array. This
allows the remaining of the cleanup (for other channels) to work
properly.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | drivers/dma/mv_xor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index f2edd6a5536e..9659e58fc8b2 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -1322,6 +1322,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev) cap_mask, irq); if (IS_ERR(xordev->channels[i])) { ret = PTR_ERR(xordev->channels[i]); + xordev->channels[i] = NULL; irq_dispose_mapping(irq); goto err_channel_add; } |