xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: Drop pointer to watchdog device from struct watchdog_device

Browse Source 
The lifetime of the watchdog device pointer is different from the lifetime
of its character device. Remove it entirely to avoid race conditions.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Guenter Roeck
2016-01-03 15:11:58 -08:00
committed by Wim Van Sebroeck
parent 2c2f3080de
commit 0254e95353
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/watchdog/watchdog_dev.c
View File

@@ -143,7 +143,8 @@ static int watchdog_stop(struct watchdog_device *wdd)
return 0;
if (test_bit(WDOG_NO_WAY_OUT, &wdd->status)) {
dev_info(wdd->dev, "nowayout prevents watchdog being stopped!\n");
pr_info("watchdog%d: nowayout prevents watchdog being stopped!\n",
wdd->id);
return -EBUSY;
}
@@ -604,7 +605,7 @@ static int watchdog_release(struct inode *inode, struct file *file)
/* If the watchdog was not stopped, send a keepalive ping */
if (err < 0) {
dev_crit(wdd->dev, "watchdog did not stop!\n");
pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id);
watchdog_ping(wdd);
}
@@ -751,7 +752,6 @@ int watchdog_dev_register(struct watchdog_device *wdd)
watchdog_cdev_unregister(wdd);
return PTR_ERR(dev);
}
wdd->dev = dev;
return ret;
}
@@ -766,8 +766,7 @@ int watchdog_dev_register(struct watchdog_device *wdd)
void watchdog_dev_unregister(struct watchdog_device *wdd)
{
device_destroy(&watchdog_class, wdd->dev->devt);
wdd->dev = NULL;
device_destroy(&watchdog_class, wdd->wd_data->cdev.dev);
watchdog_cdev_unregister(wdd);
}