| Message ID | 1395404297-12133-1-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Krzysztof Kozlowski (2014-03-21 05:18:17) > If parent device does not have of_node set the s2mps11_clk_parse_dt() > returned NULL. This NULL was later passed to of_clk_add_provider() which > dereferenced it in pr_debug() call. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> I've taken both of these patches into clk-next. Thanks! Mike > Cc: <stable@vger.kernel.org> > --- > drivers/clk/clk-s2mps11.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c > index 00a3abe103a5..27c83e45eaed 100644 > --- a/drivers/clk/clk-s2mps11.c > +++ b/drivers/clk/clk-s2mps11.c > @@ -130,7 +130,7 @@ static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev) > int i; > > if (!iodev->dev->of_node) > - return NULL; > + return ERR_PTR(-EINVAL); > > clk_np = of_find_node_by_name(iodev->dev->of_node, "clocks"); > if (!clk_np) { > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c index 00a3abe103a5..27c83e45eaed 100644 --- a/drivers/clk/clk-s2mps11.c +++ b/drivers/clk/clk-s2mps11.c @@ -130,7 +130,7 @@ static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev) int i; if (!iodev->dev->of_node) - return NULL; + return ERR_PTR(-EINVAL); clk_np = of_find_node_by_name(iodev->dev->of_node, "clocks"); if (!clk_np) {
If parent device does not have of_node set the s2mps11_clk_parse_dt() returned NULL. This NULL was later passed to of_clk_add_provider() which dereferenced it in pr_debug() call. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: <stable@vger.kernel.org> --- drivers/clk/clk-s2mps11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)