| developer | ec4ebe4 | 2022-04-12 11:17:45 +0800 | [diff] [blame^] | 1 | From d9c8bc8c1408f3e8529db6e4e04017b4c579c342 Mon Sep 17 00:00:00 2001 |
| 2 | From: Pawel Dembicki <paweldembicki@gmail.com> |
| 3 | Date: Sun, 18 Feb 2018 17:08:04 +0100 |
| 4 | Subject: [PATCH] w1: gpio: fix problem with platfom data in w1-gpio |
| 5 | |
| 6 | In devices, where fdt is used, is impossible to apply platform data |
| 7 | without proper fdt node. |
| 8 | |
| 9 | This patch allow to use platform data in devices with fdt. |
| 10 | |
| 11 | Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> |
| 12 | --- |
| 13 | drivers/w1/masters/w1-gpio.c | 7 +++---- |
| 14 | 1 file changed, 3 insertions(+), 4 deletions(-) |
| 15 | |
| 16 | --- a/drivers/w1/masters/w1-gpio.c |
| 17 | +++ b/drivers/w1/masters/w1-gpio.c |
| 18 | @@ -76,7 +76,7 @@ static int w1_gpio_probe(struct platform |
| 19 | enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN; |
| 20 | int err; |
| 21 | |
| 22 | - if (of_have_populated_dt()) { |
| 23 | + if (of_have_populated_dt() && !dev_get_platdata(&pdev->dev)) { |
| 24 | pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); |
| 25 | if (!pdata) |
| 26 | return -ENOMEM; |