summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2016-02-02 09:38:22 +0100
committerBjørn Mork <bjorn@mork.no>2016-02-02 09:38:22 +0100
commit3b6cd4af8015f24c4842e117e90fabdbaf2e61e5 (patch)
treeb898b8b4e6c0ddedaf0a4bd4d14676c6540b97ec
parent217724c7ca76767000ffb6c1a66e6ca471d99f68 (diff)
swi_setusbcomp.pl: be a bit more helpful if USB reset fails
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rwxr-xr-xscripts/swi_setusbcomp.pl17
1 files changed, 13 insertions, 4 deletions
diff --git a/scripts/swi_setusbcomp.pl b/scripts/swi_setusbcomp.pl
index a2ef7b7..e536a1f 100755
--- a/scripts/swi_setusbcomp.pl
+++ b/scripts/swi_setusbcomp.pl
@@ -641,15 +641,24 @@ sub usbreset {
$rdev = (stat($devnode))[6];
# something wrong
- return unless $rdev;
+ unless ($rdev) {
+ print "ERROR: unable to stat '$devnode'\n";
+ return;
+ }
# verify that we got the right one
- return if (&_slurp("$dev/dev") ne sprintf("%u:%u", &major($rdev), &minor($rdev)));
+ if (&_slurp("$dev/dev") ne sprintf("%u:%u", &major($rdev), &minor($rdev))) {
+ print "ERROR: '$devnode' and '$mgmt' belong to different devices!\n";
+ return;
+ }
my $foo = 0;
- open(X, ">$devnode") || return;
+ unless (open(X, ">$devnode")) {
+ print "ERROR: cannot open '$devnode': $!\n";
+ return;
+ }
if (!ioctl(X, &IOCTL_USBDEVFS_RESET, $foo)) {
- warn("ioctl failed: $!\n") if $debug;
+ print "USBDEVFS_RESET ioctl failed: $!\n";
}
close(X);
}