mirror of
https://github.com/torvalds/linux.git
synced 2024-09-20 23:13:00 +00:00
Input: rearrange input_alloc_device() to prepare for preallocating of vals
In preparation to have dev->vals memory pre-allocated rearrange code in input_alloc_device() so that it allows handling multiple points of failure. Reviewed-by: Jeff LaBundy <jeff@labundy.com> Reviewed-by: Benjamin Tissoires <bentiss@kernel.org> Link: https://lore.kernel.org/r/20240703213756.3375978-6-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
d469647baf
commit
3544cf574a
|
@ -1982,21 +1982,28 @@ struct input_dev *input_allocate_device(void)
|
|||
struct input_dev *dev;
|
||||
|
||||
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
||||
if (dev) {
|
||||
dev->dev.type = &input_dev_type;
|
||||
dev->dev.class = &input_class;
|
||||
device_initialize(&dev->dev);
|
||||
mutex_init(&dev->mutex);
|
||||
spin_lock_init(&dev->event_lock);
|
||||
timer_setup(&dev->timer, NULL, 0);
|
||||
INIT_LIST_HEAD(&dev->h_list);
|
||||
INIT_LIST_HEAD(&dev->node);
|
||||
if (!dev)
|
||||
return NULL;
|
||||
|
||||
dev_set_name(&dev->dev, "input%lu",
|
||||
(unsigned long)atomic_inc_return(&input_no));
|
||||
mutex_init(&dev->mutex);
|
||||
spin_lock_init(&dev->event_lock);
|
||||
timer_setup(&dev->timer, NULL, 0);
|
||||
INIT_LIST_HEAD(&dev->h_list);
|
||||
INIT_LIST_HEAD(&dev->node);
|
||||
|
||||
__module_get(THIS_MODULE);
|
||||
}
|
||||
dev->dev.type = &input_dev_type;
|
||||
dev->dev.class = &input_class;
|
||||
device_initialize(&dev->dev);
|
||||
/*
|
||||
* From this point on we can no longer simply "kfree(dev)", we need
|
||||
* to use input_free_device() so that device core properly frees its
|
||||
* resources associated with the input device.
|
||||
*/
|
||||
|
||||
dev_set_name(&dev->dev, "input%lu",
|
||||
(unsigned long)atomic_inc_return(&input_no));
|
||||
|
||||
__module_get(THIS_MODULE);
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user