summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-05 09:10:20 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-05 09:10:20 +0100
commit345d0b1964df83a6c3fff815fabd34e37265581f (patch)
treeab110afece59b4036a5004dd58fe48e3bef5fe11 /sound/core
parent18e352e4a73465349711a9324767e1b2453383e2 (diff)
downloadlinux-stable-345d0b1964df83a6c3fff815fabd34e37265581f.tar.gz
linux-stable-345d0b1964df83a6c3fff815fabd34e37265581f.tar.bz2
linux-stable-345d0b1964df83a6c3fff815fabd34e37265581f.zip
ALSA: hwdep - Make open callback optional
Don't require the open callback as mandatory. Now all hwdeps ops can be optional. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/hwdep.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 195cafc5a553..a70ee7f1ed98 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -99,9 +99,6 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
if (hw == NULL)
return -ENODEV;
- if (!hw->ops.open)
- return -ENXIO;
-
if (!try_module_get(hw->card->module))
return -EFAULT;
@@ -113,6 +110,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
err = -EBUSY;
break;
}
+ if (!hw->ops.open) {
+ err = 0;
+ break;
+ }
err = hw->ops.open(hw, file);
if (err >= 0)
break;
@@ -151,7 +152,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
static int snd_hwdep_release(struct inode *inode, struct file * file)
{
- int err = -ENXIO;
+ int err = 0;
struct snd_hwdep *hw = file->private_data;
struct module *mod = hw->card->module;