aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-20 12:05:13 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-20 12:05:13 +0100
commit2fc911527eb2a9ca27a7d0bfd6e2e715541d09ed (patch)
tree8211922cb84d52c177755e6efc0e3a14a5a9faa6
parent047aa0ea8e65d07c321e895b11d5f92c12ddc02f (diff)
downloadhda-emu-2fc911527eb2a9ca27a7d0bfd6e2e715541d09ed.tar.gz
Fix NULL dereference in device_del()
Don't call remove callback unless the device is really added
-rw-r--r--snd-wrapper.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/snd-wrapper.c b/snd-wrapper.c
index 7a0ccd2..e98fc30 100644
--- a/snd-wrapper.c
+++ b/snd-wrapper.c
@@ -785,8 +785,10 @@ void device_del(struct device *dev)
{
dev->registered = false;
- dev->driver->remove(dev);
- dev->driver = NULL;
+ if (dev->driver) {
+ dev->driver->remove(dev);
+ dev->driver = NULL;
+ }
}
int device_attach(struct device *dev)