diff options
| author | Linus Torvalds | 2009-01-12 15:57:34 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2009-01-12 15:57:34 -0800 |
| commit | ddb4a9dd6af72cc2c57a82d54d104d53c86384c2 (patch) | |
| tree | 913f3e48e7a63dd4907141dcfe1d10ecdfc581e8 /include | |
| parent | 87aa08b7fee79dac908c80f7593007243448ef89 (diff) | |
| parent | 24dafdf00b630cb827875c187f2a493280cab078 (diff) | |
Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Fix small typo
misdn: indentation and braces disagree - add braces
misdn: one handmade ARRAY_SIZE converted
drivers/isdn/hardware/mISDN: move a dereference below a NULL test
indentation & braces disagree - add braces
Make parameter debug writable
BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mISDNif.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 557477ac3d5b..5da3d95b27f1 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -559,7 +559,10 @@ extern void mISDN_unregister_clock(struct mISDNclock *); static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) { - return dev_get_drvdata(dev); + if (dev) + return dev_get_drvdata(dev); + else + return NULL; } extern void set_channel_address(struct mISDNchannel *, u_int, u_int); |