From: Paul Donald <redacted>
Date: Tue, 5 Mar 2024 13:59:49 +0000 (+0100)
Subject: p910nd: restart daemon even if no driver file is needed
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=685ef7d97b345c09edd428250794dd9fce07a174;p=openwrt-packages.git

p910nd: restart daemon even if no driver file is needed

Not all USB printers need a blob loading; restart the daemon
independently of driver loading.

Closes openwrt/packages#23588

Signed-off-by: Paul Donald <redacted>
Tested-by: minicx <redacted>
---

diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile
index a4949b892..062a90bd1 100644
--- a/net/p910nd/Makefile
+++ b/net/p910nd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p910nd
 PKG_VERSION:=0.97
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/p910nd
diff --git a/net/p910nd/files/p910nd.hotplug b/net/p910nd/files/p910nd.hotplug
index 1c37a9f4c..3440a86ed 100644
--- a/net/p910nd/files/p910nd.hotplug
+++ b/net/p910nd/files/p910nd.hotplug
@@ -335,10 +335,9 @@ send_driver() {
 			logger -t "$DAEMON_HOTPLUG" -p "$DAEMON_ERR" "Sending driver to $CHAR_DEV [ $THIS_USB_VIDPID ] failed for some reason."
 		else
 			logger -t "$DAEMON_HOTPLUG" -p "$DAEMON_INFO" "Sent $DRIVER_FILE to $CHAR_DEV [ $THIS_USB_VIDPID ]."
-			daemon_restart
 		fi
 	else
-		logger -t "$DAEMON_HOTPLUG"  -p "$DAEMON_ERR" "Missing driver file: $DRIVER_FILE for $CHAR_DEV [ $THIS_USB_VIDPID ] (please upload it)."
+		logger -t "$DAEMON_HOTPLUG"  -p "$DAEMON_INFO" "No driver file: $DRIVER_FILE for $CHAR_DEV [ $THIS_USB_VIDPID ] (upload it if your printer needs a driver loading)."
 	fi
 }
 
@@ -376,6 +375,8 @@ case "$ACTION" in
 			fi
 		fi
 
+		daemon_restart
+
 		;;
 	remove)
 		# device is gone