diff options
Diffstat (limited to 'sound/core/hwdep.c')
-rw-r--r-- | sound/core/hwdep.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index 444e266e7c48..27d5bf7266f0 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c | |||
@@ -330,12 +330,6 @@ static struct file_operations snd_hwdep_f_ops = | |||
330 | .mmap = snd_hwdep_mmap, | 330 | .mmap = snd_hwdep_mmap, |
331 | }; | 331 | }; |
332 | 332 | ||
333 | static struct snd_minor snd_hwdep_reg = | ||
334 | { | ||
335 | .comment = "hardware dependent", | ||
336 | .f_ops = &snd_hwdep_f_ops, | ||
337 | }; | ||
338 | |||
339 | /** | 333 | /** |
340 | * snd_hwdep_new - create a new hwdep instance | 334 | * snd_hwdep_new - create a new hwdep instance |
341 | * @card: the card instance | 335 | * @card: the card instance |
@@ -416,7 +410,7 @@ static int snd_hwdep_dev_register(struct snd_device *device) | |||
416 | sprintf(name, "hwC%iD%i", hwdep->card->number, hwdep->device); | 410 | sprintf(name, "hwC%iD%i", hwdep->card->number, hwdep->device); |
417 | if ((err = snd_register_device(SNDRV_DEVICE_TYPE_HWDEP, | 411 | if ((err = snd_register_device(SNDRV_DEVICE_TYPE_HWDEP, |
418 | hwdep->card, hwdep->device, | 412 | hwdep->card, hwdep->device, |
419 | &snd_hwdep_reg, name)) < 0) { | 413 | &snd_hwdep_f_ops, name)) < 0) { |
420 | snd_printk(KERN_ERR "unable to register hardware dependent device %i:%i\n", | 414 | snd_printk(KERN_ERR "unable to register hardware dependent device %i:%i\n", |
421 | hwdep->card->number, hwdep->device); | 415 | hwdep->card->number, hwdep->device); |
422 | snd_hwdep_devices[idx] = NULL; | 416 | snd_hwdep_devices[idx] = NULL; |
@@ -431,7 +425,8 @@ static int snd_hwdep_dev_register(struct snd_device *device) | |||
431 | } else { | 425 | } else { |
432 | if (snd_register_oss_device(hwdep->oss_type, | 426 | if (snd_register_oss_device(hwdep->oss_type, |
433 | hwdep->card, hwdep->device, | 427 | hwdep->card, hwdep->device, |
434 | &snd_hwdep_reg, hwdep->oss_dev) < 0) { | 428 | &snd_hwdep_f_ops, |
429 | hwdep->oss_dev) < 0) { | ||
435 | snd_printk(KERN_ERR "unable to register OSS compatibility device %i:%i\n", | 430 | snd_printk(KERN_ERR "unable to register OSS compatibility device %i:%i\n", |
436 | hwdep->card->number, hwdep->device); | 431 | hwdep->card->number, hwdep->device); |
437 | } else | 432 | } else |