This commit was manufactured by cvs2svn to create tagV10_34_11_100mdk

'V10_34_11_100mdk'.

1 files changed, 5 insertions, 7 deletions

diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index 9d4feaa14..e6e24eee1 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -302,8 +302,10 @@ sub config {
     $conf{gbuffers} = min($max_gbuffers, $conf{gbuffers});
     $conf{card}  = $default if !defined $cards_list{$conf{card}};
     $conf{tuner} = -1 if !defined $tuners_lst{$conf{tuner}};
-    $conf{pll}   = -1 if !defined $pll_lst{$conf{tuner}};
-    $conf{radio} =  0 if $conf{radio} !~ /(0|1)/;
+    if ($driver eq 'bttv') {
+        $conf{pll}   = -1 if !defined $pll_lst{$conf{tuner}};
+        $conf{radio} =  0 if $conf{radio} !~ /(0|1)/;
+    }
 
 
     if ($in->ask_from("BTTV configuration", N("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.
@@ -319,11 +321,7 @@ If your card is misdetected, you can force the right tuner and card types here.
                       ))
     {
         $conf{card} = $cards_list{$conf{card}};
-
-        my $options = 
-            'radio=' . ($conf{radio} ? 1 : 0) . ' ' .
-            join(' ', map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers));
-        if ($options) {
+        if (my $options = join(' ', if_($driver eq 'bttv', 'radio=' . ($conf{radio} ? 1 : 0)), map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers))) {
             log::l(qq([harddrake::v4l] set "$options" options for $driver));
 #             log::explanations("modified file /etc/modules.conf ($options)") if $::isStandalone;
               modules::set_options($driver, $options);