diff options
-rw-r--r-- | drivers/clk/bcm/clk-bcm2835.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index fa0d5c8611a0..5e1843321bc8 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c | |||
@@ -1395,7 +1395,7 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, | |||
1395 | struct bcm2835_clock *clock; | 1395 | struct bcm2835_clock *clock; |
1396 | struct clk_init_data init; | 1396 | struct clk_init_data init; |
1397 | const char *parents[1 << CM_SRC_BITS]; | 1397 | const char *parents[1 << CM_SRC_BITS]; |
1398 | size_t i, j; | 1398 | size_t i; |
1399 | int ret; | 1399 | int ret; |
1400 | 1400 | ||
1401 | /* | 1401 | /* |
@@ -1405,12 +1405,11 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, | |||
1405 | for (i = 0; i < data->num_mux_parents; i++) { | 1405 | for (i = 0; i < data->num_mux_parents; i++) { |
1406 | parents[i] = data->parents[i]; | 1406 | parents[i] = data->parents[i]; |
1407 | 1407 | ||
1408 | for (j = 0; j < ARRAY_SIZE(cprman_parent_names); j++) { | 1408 | ret = match_string(cprman_parent_names, |
1409 | if (strcmp(parents[i], cprman_parent_names[j]) == 0) { | 1409 | ARRAY_SIZE(cprman_parent_names), |
1410 | parents[i] = cprman->real_parent_names[j]; | 1410 | parents[i]); |
1411 | break; | 1411 | if (ret >= 0) |
1412 | } | 1412 | parents[i] = cprman->real_parent_names[ret]; |
1413 | } | ||
1414 | } | 1413 | } |
1415 | 1414 | ||
1416 | memset(&init, 0, sizeof(init)); | 1415 | memset(&init, 0, sizeof(init)); |