Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[~andy/linux] / drivers / watchdog / wm831x_wdt.c

diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index b1815c5ed7a72ac7c24e90e8dc62649f8a32bd0b..87d66d236c3e668c33936f0abbc156dc43d7489d 100644 (file)
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -247,8 +247,9 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
                reg |= pdata->software << WM831X_WDOG_RST_SRC_SHIFT;
 
                if (pdata->update_gpio) {
-                       ret = gpio_request(pdata->update_gpio,
-                                          "Watchdog update");
+                       ret = gpio_request_one(pdata->update_gpio,
+                                              GPIOF_DIR_OUT | GPIOF_INIT_LOW,
+                                              "Watchdog update");
                        if (ret < 0) {
                                dev_err(wm831x->dev,
                                        "Failed to request update GPIO: %d\n",
@@ -256,14 +257,6 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
                                goto err;
                        }
 
-                       ret = gpio_direction_output(pdata->update_gpio, 0);
-                       if (ret != 0) {
-                               dev_err(wm831x->dev,
-                                       "gpio_direction_output returned: %d\n",
-                                       ret);
-                               goto err_gpio;
-                       }
-
                        driver_data->update_gpio = pdata->update_gpio;
 
                        /* Make sure the watchdog takes hardware updates */