From 5e87f40090eceb7aff9cf28b81a438c039b8df55 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 21 Mar 2005 15:40:18 +0000
Subject: (getUPS) enforce "hidups" as driver for BackPro UPSes

---
 perl-install/detect_devices.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 1561fc9bb..618cb2e6c 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -592,13 +592,13 @@ sub getUPS() {
         $_;
     } grep { $_->{DESCRIPTION} =~ /MGE UPS/ } values %serialprobe),
       # USB UPSs;
-      (grep { $_->{description} =~ /American Power Conversion\|Back-UPS/ } @usb_devices),
+      (grep { $_->{driver} = 'hidups' if $_->{driver} eq 'usbhid'; $_->{description} =~ /American Power Conversion\|Back-UPS/ } @usb_devices),
       (map {
           $_->{port} = "auto";
           $_->{media_type} = 'UPS';
           $_->{driver} = 'newhidups';
           $_;
-      } grep { $_->{driver} =~ /ups$/ } @usb_devices);
+      } grep { $_->{driver} =~ /ups$/ && $_->{description} !~ /American Power Conversion\|Back-UPS/ } @usb_devices);
 }
 
 $pcitable_addons = <<'EOF';
-- 
cgit v1.2.1