From 4bd0efc9df913ed36e7c4d489638e5e9f549ea16 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Mon, 1 Mar 2004 14:47:19 +0000
Subject: Fixed bug #7242: Firmware was not found by "gt68xx" SANE backend.

---
 perl-install/standalone/scannerdrake | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'perl-install/standalone/scannerdrake')

diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index adc167bc2..3ddedfe14 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -165,7 +165,7 @@ sub dynamic() {
 }
 
 sub installfirmware {
-    my ($model) = @_;
+    my ($model, $backend) = @_;
     my $firmware;
     my $choice = N("Do not install firmware file");
     while (1) {
@@ -204,7 +204,7 @@ sub installfirmware {
 	
     }
     # Install the firmware file in /usr/share/sane/firmware
-    $firmware = scanner::installfirmware($firmware);
+    $firmware = scanner::installfirmware($firmware, $backend);
     return $firmware;
 }
 
@@ -266,7 +266,7 @@ sub updatefirmware {
     return 0 if !$firmware;
 
     # Install the firmware file in /usr/share/sane/firmware
-    $firmware = scanner::installfirmware($firmware);
+    $firmware = scanner::installfirmware($firmware, $_->{val}{BACKEND});
 
     # Enter the path to the firmware in the appropriate config file
     foreach (@configured) {
@@ -367,7 +367,8 @@ sub tryConfScanner {
     ($vendor, $product) = scanner::get_usb_ids_for_port($port);
     my $firmware;
     if (grep { /FIRMWARELINE/ } @{$scanner::scannerDB->{$model}{lines}} ) {
-	$firmware = installfirmware($model);
+	$firmware = installfirmware($model, 
+				    $scanner::scannerDB->{$model}{server});
 	return 0 if $firmware eq "///";
     }
     scanner::confScanner($model, $port, $vendor, $product, $firmware);
-- 
cgit v1.2.1