mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 11:16:11 +00:00
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>
This commit is contained in:
parent
18e352e4a7
commit
345d0b1964
1 changed files with 5 additions and 4 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue