2 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/harddrake/check_snd.pl b/perl-install/harddrake/check_snd.pl
index dfa007b80..4721bed40 100755
--- a/perl-install/harddrake/check_snd.pl
+++ b/perl-install/harddrake/check_snd.pl
@@ -10,7 +10,7 @@ use list_modules;
 
 my @listed_modules = @{$list_modules::l{multimedia}{sound}};
 my @drivers = (keys %harddrake::sound::oss2alsa, keys %harddrake::sound::alsa2oss);
-my @alternatives = uniq map { @{$_} } values %harddrake::sound::oss2alsa, values %harddrake::sound::alsa2oss;
+my @alternatives = uniq map { @$_ } values %harddrake::sound::oss2alsa, values %harddrake::sound::alsa2oss;
 
 # check harddrake::sound's data structures're coherent
 print "unknown alternative drivers : [", join(', ', difference2(\@alternatives, \@drivers)), "]\n";
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index afad37117..cbc43d8be 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -570,9 +570,7 @@ sub custom_id {
          N("cpu # ") . $device->{processor} . ": " . $device->{'model name'} :
          $device->{"Socket Designation"} ?
          "$device->{name} (" . $device->{"Socket Designation"} . ")" :
-         $device->{name} ? $device->{name} :
-           (($device->{description}) ? $device->{description} :
-              (($device->{Vendor}) ? $device->{Vendor} : $str)));
+         $device->{name} || $device->{description} || $device->{Vendor} || $str);
 }
 
 1;