From 0cc08e00c07e715231ecc918755d60313660a271 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 17 Mar 2016 20:33:15 +0000 Subject: [PATCH] Bug fix: Linux /proc/sys/dev/cdrom/info overrode SCSI dev family conversion --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/sg-linux.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index fed9c421..ea86e9ee 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2016.03.10.195636" +#define Cdrskin_timestamP "2016.03.17.203356" diff --git a/libburn/trunk/libburn/sg-linux.c b/libburn/trunk/libburn/sg-linux.c index 06bd7c1b..56b29612 100644 --- a/libburn/trunk/libburn/sg-linux.c +++ b/libburn/trunk/libburn/sg-linux.c @@ -1620,6 +1620,8 @@ next_ata:; next_proc_info:; baseno += ata_limit; + if (burn_sg_use_family != 0) /* Only with default enumeration */ + return 0; for (i = 0; i < idx->info_count; i++) { if ((idx->info_list)[i][0] == 0) continue;