X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=ae8f3b8ce5a540f6697c89ba2454dd11d2a8cb56;hb=1f488f50b91a67ffc85aa36cea63f09b580aa36e;hp=069ad1534cf47270155056044bec728ae75c2df8;hpb=6e43c3d5318a8ff320bf6539a9efe7f0b8497e2f;p=libsigrok.git diff --git a/src/device.c b/src/device.c index 069ad153..ae8f3b8c 100644 --- a/src/device.c +++ b/src/device.c @@ -529,8 +529,6 @@ SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver) */ SR_API int sr_dev_clear(const struct sr_dev_driver *driver) { - int ret; - if (!driver) { sr_err("Invalid driver."); return SR_ERR_ARG; @@ -548,12 +546,7 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver) /* No log message here, too verbose and not very useful. */ - if (driver->dev_clear) - ret = driver->dev_clear(driver); - else - ret = std_dev_clear_with_callback(driver, NULL); - - return ret; + return driver->dev_clear(driver); } /**