Skip to content

Commit

Permalink
Input: fix input_free_device() implementation
Browse files Browse the repository at this point in the history
input_free_device can't just call kfree because if input_register_device
fails after successfully registering corresponding class device there
is a chance that someone could get a reference to it. We need to use
input_put_device() to make sure that we don't delete input device until
last reference to it was dropped.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Mar 14, 2006
1 parent 58a343f commit 493a7e0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions include/linux/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ struct input_absinfo {
#define BTN_GEAR_UP 0x151

#define KEY_OK 0x160
#define KEY_SELECT 0x161
#define KEY_SELECT 0x161
#define KEY_GOTO 0x162
#define KEY_CLEAR 0x163
#define KEY_POWER2 0x164
Expand Down Expand Up @@ -995,11 +995,6 @@ static inline void init_input_dev(struct input_dev *dev)

struct input_dev *input_allocate_device(void);

static inline void input_free_device(struct input_dev *dev)
{
kfree(dev);
}

static inline struct input_dev *input_get_device(struct input_dev *dev)
{
return to_input_dev(class_device_get(&dev->cdev));
Expand All @@ -1010,6 +1005,11 @@ static inline void input_put_device(struct input_dev *dev)
class_device_put(&dev->cdev);
}

static inline void input_free_device(struct input_dev *dev)
{
input_put_device(dev);
}

int input_register_device(struct input_dev *);
void input_unregister_device(struct input_dev *);

Expand Down

0 comments on commit 493a7e0

Please sign in to comment.