Commit e7100fba authored by Henning Meier-Geinitz's avatar Henning Meier-Geinitz Committed by Greg Kroah-Hartman

[PATCH] USB scanner.c: Adjust syslog output

This patch prints the vendor + product ids of the scanner after it has
been successfully detected.

Also the annoying error message about "Scanner device is already open"
was downgraded to a dbg. Scanning for devices while one scanner device
was open produced several 100 error messages in syslog.
parent 80b5d998
...@@ -342,6 +342,9 @@ ...@@ -342,6 +342,9 @@
* - Removed PV8630 ioctls. Use the standard ioctls instead. * - Removed PV8630 ioctls. Use the standard ioctls instead.
* - Made endpoint detection more generic. Basically, only one bulk-in * - Made endpoint detection more generic. Basically, only one bulk-in
* endpoint is required, everything else is optional. * endpoint is required, everything else is optional.
* - New maintainer: Henning Meier-Geinitz.
* - Print ids and device number when a device was detected.
* - Don't print errors when the device is busy.
* *
* TODO * TODO
* - Performance * - Performance
...@@ -473,7 +476,7 @@ open_scanner(struct inode * inode, struct file * file) ...@@ -473,7 +476,7 @@ open_scanner(struct inode * inode, struct file * file)
} }
if (scn->isopen) { if (scn->isopen) {
err("open_scanner(%d): Scanner device is already open", scn_minor); dbg("open_scanner(%d): Scanner device is already open", scn_minor);
err = -EBUSY; err = -EBUSY;
goto out_error; goto out_error;
} }
...@@ -1059,6 +1062,9 @@ probe_scanner(struct usb_interface *intf, ...@@ -1059,6 +1062,9 @@ probe_scanner(struct usb_interface *intf,
if (scn->devfs == NULL) if (scn->devfs == NULL)
dbg("scanner%d: device node registration failed", scn_minor); dbg("scanner%d: device node registration failed", scn_minor);
info ("USB scanner device (0x%04x/0x%04x) now attached to %s",
dev->descriptor.idVendor, dev->descriptor.idProduct, name);
up(&scn_mutex); up(&scn_mutex);
usb_set_intfdata(intf, scn); usb_set_intfdata(intf, scn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment