diff options
author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-11-20 20:10:11 +0530 |
---|---|---|
committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-11-20 20:10:11 +0530 |
commit | f0ce6d71bb1b0929f1a10cbe5a089ceaa16b3205 (patch) | |
tree | 51b7b71e10d5ef615c39dc93039a7304912f2d89 /sound | |
parent | d0fee18fa88f1272386663260703db45d1ab6628 (diff) | |
parent | 0cbac004e67307949714c176c8a7af9c1da980b9 (diff) |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.99-hikey
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/seq/seq_device.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c index c4acf17e9f5e..e40a2cba5002 100644 --- a/sound/core/seq/seq_device.c +++ b/sound/core/seq/seq_device.c @@ -148,8 +148,10 @@ void snd_seq_device_load_drivers(void) flush_work(&autoload_work); } EXPORT_SYMBOL(snd_seq_device_load_drivers); +#define cancel_autoload_drivers() cancel_work_sync(&autoload_work) #else #define queue_autoload_drivers() /* NOP */ +#define cancel_autoload_drivers() /* NOP */ #endif /* @@ -159,6 +161,7 @@ static int snd_seq_device_dev_free(struct snd_device *device) { struct snd_seq_device *dev = device->device_data; + cancel_autoload_drivers(); put_device(&dev->dev); return 0; } |