OSDN Git Service

dmaengine: ste_dma40: Rectify incorrect configuration validation checking
authorLee Jones <lee.jones@linaro.org>
Fri, 3 May 2013 14:31:55 +0000 (15:31 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 23 May 2013 19:10:56 +0000 (21:10 +0200)
If we compare an event's group (dev_type / 16) with STEDMA40_DEV_DST_MEMORY
(-1), the only way we'd obtain a positive result is if we passed -16 as a
device type, which is unfeasible. Instead, it would be much more sane to
compare STEDMA40_DEV_DST_MEMORY against the raw dev_type in order to expect
the expected result.

Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/dma/ste_dma40.c

index c47139a..d481cb8 100644 (file)
@@ -1785,19 +1785,19 @@ static int d40_validate_conf(struct d40_chan *d40c,
        }
 
        if (conf->dir == STEDMA40_MEM_TO_PERIPH &&
-           dst_event_group == STEDMA40_DEV_DST_MEMORY) {
+           conf->dst_dev_type == STEDMA40_DEV_DST_MEMORY) {
                chan_err(d40c, "Invalid dst\n");
                res = -EINVAL;
        }
 
        if (conf->dir == STEDMA40_PERIPH_TO_MEM &&
-           src_event_group == STEDMA40_DEV_SRC_MEMORY) {
+           conf->src_dev_type == STEDMA40_DEV_SRC_MEMORY) {
                chan_err(d40c, "Invalid src\n");
                res = -EINVAL;
        }
 
-       if (src_event_group == STEDMA40_DEV_SRC_MEMORY &&
-           dst_event_group == STEDMA40_DEV_DST_MEMORY && is_log) {
+       if (conf->src_dev_type == STEDMA40_DEV_SRC_MEMORY &&
+           conf->dst_dev_type == STEDMA40_DEV_DST_MEMORY && is_log) {
                chan_err(d40c, "No event line\n");
                res = -EINVAL;
        }