Showing the changes to kernel/workqueue.c (1 of 321 files). Show all
Unified · Split
| @@ -3018,14 +3018,6 @@ static bool __cancel_work(struct work_struct *work, bool is_dwork) · 3017 unmodified lines | ||
| 3018 | 3018 | return ret; |
| 3019 | 3019 | } |
| 3020 | 3020 | |
| 3021 | −/* | |
| 3022 | − * See cancel_delayed_work() | |
| 3023 | − */ | |
| 3024 | −bool cancel_work(struct work_struct *work) | |
| 3025 | −{ | |
| 3026 | − return __cancel_work(work, false); | |
| 3027 | −} | |
| 3028 | − | |
| 3029 | 3021 | /** |
| 3030 | 3022 | * cancel_delayed_work - cancel a delayed work |
| 3031 | 3023 | * @dwork: delayed_work to cancel |
| @@ -5337,7 +5329,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) · 2305 unmodified lines | ||
| 5337 | 5329 | |
| 5338 | 5330 | ret = device_register(&wq_dev->dev); |
| 5339 | 5331 | if (ret) { |
| 5340 | − kfree(wq_dev); | |
| 5332 | + put_device(&wq_dev->dev); | |
| 5341 | 5333 | wq->wq_dev = NULL; |
| 5342 | 5334 | return ret; |
| 5343 | 5335 | } |