diff options
| author |   Lee Jones <lee.jones@linaro.org> | 2013-05-03 15:32:08 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2013-05-23 21:12:55 +0200 |
| commit | 8b2fe9b6b310a6e5d68de648d6f0697227581d66 (patch) | |
| tree | 5b0de1364619adbcc1956693c09c30c9a41121da /drivers/dma/ste_dma40.c | |
| parent | dmaengine: ste_dma40: Remove 'always true' checking (diff) | |
| download | linux-dev-8b2fe9b6b310a6e5d68de648d6f0697227581d66.tar.xz linux-dev-8b2fe9b6b310a6e5d68de648d6f0697227581d66.zip | |
dmaengine: ste_dma40: Move rev error-check up to revision acquisition
At the moment we fetch the hardware revision, then do some stuff, then
check whether the revision is correct and return in error if it's not.
Well we may as well check it as soon as we know what it is, so let's
move the check right up underneath where we acquire the version.
Acked-by: Vinod Koul <vnod.koul@intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/dma/ste_dma40.c')
| -rw-r--r-- | drivers/dma/ste_dma40.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 7ccb8e2d59be..fb79db3313d3 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3204,6 +3204,10 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev) * DB8540v1 has revision 4 */ rev = AMBA_REV_BITS(pid); + if (rev < 2) { + d40_err(&pdev->dev, "hardware revision: %d is not supported", rev); + goto failure; + } plat_data = pdev->dev.platform_data; @@ -3218,12 +3222,6 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev) dev_info(&pdev->dev, "hardware revision: %d @ 0x%x with %d physical channels\n", rev, res->start, num_phy_chans); - if (rev < 2) { - d40_err(&pdev->dev, "hardware revision: %d is not supported", - rev); - goto failure; - } - base = kzalloc(ALIGN(sizeof(struct d40_base), 4) + (num_phy_chans + num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) * sizeof(struct d40_chan), GFP_KERNEL); |