diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /net/caif/caif_dev.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
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); |