201-ARM-at91-usb-determine_rate-backport.patch 836 B

1234567891011121314151617181920
  1. --- a/drivers/clk/at91/clk-usb.c
  2. +++ b/drivers/clk/at91/clk-usb.c
  3. @@ -59,7 +59,7 @@ static unsigned long at91sam9x5_clk_usb_
  4. static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw,
  5. unsigned long rate,
  6. unsigned long *best_parent_rate,
  7. - struct clk_hw **best_parent_hw)
  8. + struct clk **best_parent_clk)
  9. {
  10. struct clk *parent = NULL;
  11. long best_rate = -EINVAL;
  12. @@ -91,7 +91,7 @@ static long at91sam9x5_clk_usb_determine
  13. best_rate = tmp_rate;
  14. best_diff = tmp_diff;
  15. *best_parent_rate = tmp_parent_rate;
  16. - *best_parent_hw = __clk_get_hw(parent);
  17. + *best_parent_clk = parent;
  18. }
  19. if (!best_diff || tmp_rate < rate)