Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 65c040f7 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

fa-zio-drv.c: fix exit on error bug 

Signed-off-by: 's avatarFederico Vaga <federico.vaga@gmail.com>
parent af2d5a22
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
fa-zio-drv.c
View file @ 65c040f7
......@@ -663,11 +663,20 @@ int fa_zio_init(struct fa_dev *fa)
dev_err(hwdev, "DDR3 Calibration not done\n");
return -ENODEV;
}
/* Register our trigger hardware */
err = zio_register_trig(&zfat_type, "fmc-adc-trg");
if (err) {
dev_err(hwdev, "Cannot register ZIO trigger fmc-adc-trig\n");
goto out_trg;
}
/* Allocate the hardware zio_device for registration */
fa->hwzdev = zio_allocate_device();
if (IS_ERR(fa->hwzdev)) {
dev_err(hwdev, "Cannot allocate ZIO device\n");
return PTR_ERR(fa->hwzdev);
err = PTR_ERR(fa->hwzdev);
goto out_allocate;
}
/* Mandatory fields */
......@@ -677,13 +686,6 @@ int fa_zio_init(struct fa_dev *fa)
/* Our dev_id is bus+devfn */
dev_id = (pdev->bus->number << 8) | pdev->devfn;
/* Register our trigger hardware */
err = zio_register_trig(&zfat_type, "fmc-adc-trg");
if (err) {
dev_err(hwdev, "Cannot register ZIO trigger fmc-adc-trig\n");
goto out_trg;
}
/* Register the hardware zio_device */
err = zio_register_device(fa->hwzdev, "fmc-adc", dev_id);
if (err) {
......@@ -693,9 +695,10 @@ int fa_zio_init(struct fa_dev *fa)
return 0;
out_dev:
zio_unregister_device(fa->hwzdev);
out_trg:
zio_free_device(fa->hwzdev);
out_allocate:
zio_unregister_trig(&zfat_type);
out_trg:
return err;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment