diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
| commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
| tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /net/caif/caif_dev.c | |
| parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
| parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'net/caif/caif_dev.c')
| -rw-r--r-- | net/caif/caif_dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index b99369a055d1..a42a408306e4 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c | |||
| @@ -307,6 +307,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, | |||
| 307 | 307 | ||
| 308 | case NETDEV_UNREGISTER: | 308 | case NETDEV_UNREGISTER: |
| 309 | caifd = caif_get(dev); | 309 | caifd = caif_get(dev); |
| 310 | if (caifd == NULL) | ||
| 311 | break; | ||
| 310 | netdev_info(dev, "unregister\n"); | 312 | netdev_info(dev, "unregister\n"); |
| 311 | atomic_set(&caifd->state, what); | 313 | atomic_set(&caifd->state, what); |
| 312 | caif_device_destroy(dev); | 314 | caif_device_destroy(dev); |