From add673ee95090e4d8d024e9b32a05f6491b3b343 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 22 Jul 2004 02:57:46 +0000
Subject: more cleanup

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

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 77fa5c388..ae6fdc2a7 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -857,9 +857,8 @@ sub suggest_mount_point {
     my $name = $e->{media_type};
     if (member($e->{media_type}, 'hd', 'fd')) {
 	if (exists $e->{usb_driver}) {
-	    return usb2removable($e) || 'removable';
-	}
-	if (isZipDrive($e)) {
+	    $name = usb2removable($e) || 'removable';
+	} elsif (isZipDrive($e)) {
 	    $name = 'zip';
 	} elsif ($e->{media_type} eq 'fd') {
 	    $name = 'floppy';
-- 
cgit v1.2.1