diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 21:26:54 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 21:26:54 +0200 |
commit | 61441d066d8f7691ad3d9afdf1d3ae94a478c057 (patch) | |
tree | 0876449595bcdb6b05e0393805fc170598b65d03 /sound/core/hwdep.c | |
parent | de04df3a2555ac04d19c3ad6528503d5bf4ab0e7 (diff) | |
download | kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.zip kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.tar.gz kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.tar.bz2 |
remove compat from include, get new scripts working
further update code, especially sound
remove initramfs files for galaxys2 and d710 and a busybox binary
Diffstat (limited to 'sound/core/hwdep.c')
-rw-r--r-- | sound/core/hwdep.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index 32fb2fe..3f7f662 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/time.h> #include <linux/mutex.h> +#include <linux/module.h> #include <sound/core.h> #include <sound/control.h> #include <sound/minors.h> @@ -279,7 +280,14 @@ static int snd_hwdep_control_ioctl(struct snd_card *card, if (get_user(device, (int __user *)arg)) return -EFAULT; mutex_lock(®ister_mutex); - device = device < 0 ? 0 : device + 1; + + if (device < 0) + device = 0; + else if (device < SNDRV_MINOR_HWDEPS) + device++; + else + device = SNDRV_MINOR_HWDEPS; + while (device < SNDRV_MINOR_HWDEPS) { if (snd_hwdep_search(card, device)) break; |