GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-09-04 10:12:10 +00:00
Code Issues Releases Wiki Activity

Check return code for bitfury_open and release resources properly on failed initialisation.

Browse Source
This commit is contained in:
Con Kolivas 2013-09-27 11:20:03 +10:00
parent 59b33c1a58
commit 703724a3f4
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
driver-bitfury.c
View File

@ -35,12 +35,16 @@ static void bitfury_empty_intbuf(struct cgpu_info *bitfury)
usb_read_ii(bitfury, 0, buf, 8, &amount, C_BF1_IFLUSH); usb_read_ii(bitfury, 0, buf, 8, &amount, C_BF1_IFLUSH);
} }
static void bitfury_open(struct cgpu_info *bitfury) static bool bitfury_open(struct cgpu_info *bitfury)
{ {
int err;
bitfury_empty_intbuf(bitfury); bitfury_empty_intbuf(bitfury);
/* Magic open sequence */ /* Magic open sequence */
usb_transfer(bitfury, 0x21, 0x22, 0x0003, 0, C_BF1_OPEN); err = usb_transfer(bitfury, 0x21, 0x22, 0x0003, 0, C_BF1_OPEN);
bitfury_empty_buffer(bitfury); if (!err)
bitfury_empty_buffer(bitfury);
return !err;
} }
static void bitfury_close(struct cgpu_info *bitfury) static void bitfury_close(struct cgpu_info *bitfury)
@ -109,10 +113,8 @@ static bool bitfury_detect_one(struct libusb_device *dev, struct usb_find_device
bitfury = usb_alloc_cgpu(&bitfury_drv, 1); bitfury = usb_alloc_cgpu(&bitfury_drv, 1);
if (!usb_init(bitfury, dev, found)) { if (!usb_init(bitfury, dev, found))
bitfury = usb_free_cgpu(bitfury);
goto out; goto out;
}
applog(LOG_INFO, "%s %d: Found at %s", bitfury->drv->name, applog(LOG_INFO, "%s %d: Found at %s", bitfury->drv->name,
bitfury->device_id, bitfury->device_path); bitfury->device_id, bitfury->device_path);
@ -123,7 +125,11 @@ static bool bitfury_detect_one(struct libusb_device *dev, struct usb_find_device
usb_buffer_enable(bitfury); usb_buffer_enable(bitfury);
bitfury_open(bitfury); if (!bitfury_open(bitfury)) {
applog(LOG_INFO, "%s %d: Failed to open", bitfury->drv->name,
bitfury->device_id);
goto out_close;
}
/* Send getinfo request */ /* Send getinfo request */
if (!bitfury_getinfo(bitfury, info)) if (!bitfury_getinfo(bitfury, info))
@ -145,7 +151,9 @@ static bool bitfury_detect_one(struct libusb_device *dev, struct usb_find_device
return true; return true;
out_close: out_close:
bitfury_close(bitfury); bitfury_close(bitfury);
usb_uninit(bitfury);
out: out:
bitfury = usb_free_cgpu(bitfury);
return false; return false;
} }