summaryrefslogtreecommitdiff
path: root/backend/epsonds.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:29 +0100
commit882fd010527b8d8823f09e19edbed3746265fa08 (patch)
treebe5c7cace6697afc753c152d13ad5145d0884a42 /backend/epsonds.c
parent527bedac30eb120915718eb7997e6dacd583512e (diff)
parente0d94cf4d39395df1e2c6bb4d967200298c13881 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/epsonds.c')
-rw-r--r--backend/epsonds.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/backend/epsonds.c b/backend/epsonds.c
index 0815535..72d01d8 100644
--- a/backend/epsonds.c
+++ b/backend/epsonds.c
@@ -1258,6 +1258,7 @@ const epsonds_profile_map epsonds_models_predefined[] = {
{0x118A, "PID 118A","ET-2810 Series", 7},
{0x118A, "PID 118A","L3250 Series", 7},
{0x119B, "PID 119B","XP-2150 Series", 7},
+ {0x11B1, "PID 11B1","XP-2200 Series", 7},
{0x00, "","", 0x00 }
};
@@ -1629,10 +1630,7 @@ device_detect(const char *name, int type, SANE_Status *status)
{//Convert to user friendly model name
free(s->hw->model);
- char* deviceName = (char*)malloc(strlen(map->deviceID) + 1);
- memset(deviceName, 0, strlen(map->deviceID) + 1);
- strncpy(deviceName, map->deviceID, strlen(map->deviceID));
- s->hw->model = deviceName;
+ s->hw->model = strdup(map->deviceID);
s->hw->sane.model = s->hw->model;
}
{// set lutid