diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-10 10:25:12 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-10 10:25:12 +0100 |
| commit | f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef (patch) | |
| tree | 58ebebc3f22375fe5d1e40e851f0907476f701c9 /src/cameras/pf.c | |
| parent | c3b3cfd97b51bf6e6970156c92506cb6fa037b65 (diff) | |
| download | uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.tar.gz uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.tar.bz2 uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.tar.xz uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.zip | |
Add IPE infrastructure and make sure that cameras check grabber existence
Diffstat (limited to 'src/cameras/pf.c')
| -rw-r--r-- | src/cameras/pf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cameras/pf.c b/src/cameras/pf.c index d32f62f..a39fd3d 100644 --- a/src/cameras/pf.c +++ b/src/cameras/pf.c @@ -208,10 +208,7 @@ static uint32_t uca_pf_destroy(struct uca_camera_t *cam) uint32_t uca_pf_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber) { int num_ports; - if (pfPortInit(&num_ports) < 0) - return UCA_ERR_CAM_NOT_FOUND; - - if (pfDeviceOpen(0) < 0) + if ((grabber == NULL) || (pfPortInit(&num_ports) < 0) || (pfDeviceOpen(0) < 0)) return UCA_ERR_CAM_NOT_FOUND; /* We could check if a higher baud rate is supported, but... forget about |