Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[~shefty/rdma-dev.git] / sound / firewire / isight.c

diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index cd094ecaca3befb440ad1dea44b279fdfbca7930..d428ffede4f33bfb885adc7368c3317bd3688dc7 100644 (file)
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -611,7 +611,6 @@ static void isight_card_free(struct snd_card *card)
 
        fw_iso_resources_destroy(&isight->resources);
        fw_unit_put(isight->unit);
 
        fw_iso_resources_destroy(&isight->resources);
        fw_unit_put(isight->unit);

-       fw_device_put(isight->device);

        mutex_destroy(&isight->mutex);
 }
 
        mutex_destroy(&isight->mutex);
 }
 


@@ -644,7 +643,7 @@ static int isight_probe(struct device *unit_dev)
        isight->card = card;
        mutex_init(&isight->mutex);
        isight->unit = fw_unit_get(unit);
        isight->card = card;
        mutex_init(&isight->mutex);
        isight->unit = fw_unit_get(unit);

-       isight->device = fw_device_get(fw_dev);
+       isight->device = fw_dev;

        isight->audio_base = get_unit_base(unit);
        if (!isight->audio_base) {
                dev_err(&unit->device, "audio unit base not found\n");
        isight->audio_base = get_unit_base(unit);
        if (!isight->audio_base) {
                dev_err(&unit->device, "audio unit base not found\n");


@@ -681,7 +680,6 @@ static int isight_probe(struct device *unit_dev)
 
 err_unit:
        fw_unit_put(isight->unit);
 
 err_unit:
        fw_unit_put(isight->unit);

-       fw_device_put(isight->device);

        mutex_destroy(&isight->mutex);
 error:
        snd_card_free(card);
        mutex_destroy(&isight->mutex);
 error:
        snd_card_free(card);