free handler after another

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 4b4c147bc8f361eac649cada055fa7c22eb6e2a7..33c5deef58749770fefd27f897bf21ae2c1d03e1 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -238,12 +238,6 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 void kds_s2000w_handler_close(void* handle)
 {
        debug_printf(ALL, "kds_s2000w_handler_close");
-       handler* h = (handler*) handle;
-       if (h == NULL)
-               return;
-
-       kds_s2000w_client_close_session(h->sessionid);
-       h->sessionid = 0;
        json_object_put(resp_config);
        resp_config = NULL;
        kds_s2000w_client_response_free(resp);
@@ -252,6 +246,13 @@ void kds_s2000w_handler_close(void* handle)
        image.data = NULL;
        free(pnm_image.data);
        pnm_image.data = NULL;
+
+       handler* h = (handler*) handle;
+       if (h == NULL)
+               return;
+
+       kds_s2000w_client_close_session(h->sessionid);
+       h->sessionid = 0;
        free(h->current_scan_status);
        h->current_scan_status = NULL;
        free(h->current_metadata->image);

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 553ce12fc7ace5e887414439e958778d11fd0dcb..e4ae3dc1ba3007c70dfb8b2ea3e72264ec5eab0a 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -55,7 +55,6 @@ SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list,
        device_info->vendor = "Kodak";
        device_info->model = "Kodak Alaris s2000w series";
        device_info->type = "sheetfed scanner";
-
        **device_list = device_info;
 
        return SANE_STATUS_GOOD;