[PATCH] Remove readv/writev methods and use aio_read/aio_write instead

[pandora-kernel.git] / sound / core / device.c

diff --git a/sound/core/device.c b/sound/core/device.c
index 6ce4da4..ccb2581 100644 (file)
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(snd_device_new);
  * @device_data: the data pointer to release
  *
  * Removes the device from the list on the card and invokes the
- * callback, dev_unregister or dev_free, corresponding to the state.
+ * callbacks, dev_disconnect and dev_free, corresponding to the state.
  * Then release the device.
  *
  * Returns zero if successful, or a negative error code on failure or if the
@@ -90,16 +90,14 @@ int snd_device_free(struct snd_card *card, void *device_data)
                        continue;
                /* unlink */
                list_del(&dev->list);
-               if ((dev->state == SNDRV_DEV_REGISTERED ||
-                    dev->state == SNDRV_DEV_DISCONNECTED) &&
-                   dev->ops->dev_unregister) {
-                       if (dev->ops->dev_unregister(dev))
-                               snd_printk(KERN_ERR "device unregister failure\n");
-               } else {
-                       if (dev->ops->dev_free) {
-                               if (dev->ops->dev_free(dev))
-                                       snd_printk(KERN_ERR "device free failure\n");
-                       }
+               if (dev->state == SNDRV_DEV_REGISTERED &&
+                   dev->ops->dev_disconnect)
+                       if (dev->ops->dev_disconnect(dev))
+                               snd_printk(KERN_ERR
+                                          "device disconnect failure\n");
+               if (dev->ops->dev_free) {
+                       if (dev->ops->dev_free(dev))
+                               snd_printk(KERN_ERR "device free failure\n");
                }
                kfree(dev);
                return 0;