diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-04-24 13:55:58 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-04-24 13:55:58 -0400 |
| commit | a4fcef851a5c6af8210ed4cdbdfe40b0152e617a (patch) | |
| tree | 3e4f59cae47cf42350d7c3b71accd3531769e73a /include/linux/input.h | |
| parent | 720922d70cf68dd9522a8a8b6c24a8db5b04c928 (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
| download | lwn-a4fcef851a5c6af8210ed4cdbdfe40b0152e617a.tar.gz lwn-a4fcef851a5c6af8210ed4cdbdfe40b0152e617a.zip | |
Merge tag 'v2.6.25'
they'll never take me alive!
Conflicts:
drivers/net/wireless/libertas/main.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c
Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 1bdc39a8c76c..cae2c35d1206 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -1227,12 +1227,13 @@ void input_free_device(struct input_dev *dev); static inline struct input_dev *input_get_device(struct input_dev *dev) { - return to_input_dev(get_device(&dev->dev)); + return dev ? to_input_dev(get_device(&dev->dev)) : NULL; } static inline void input_put_device(struct input_dev *dev) { - put_device(&dev->dev); + if (dev) + put_device(&dev->dev); } static inline void *input_get_drvdata(struct input_dev *dev) |