The patch titled
usblp: Add serial number to device ID
has been removed from the -mm tree. Its filename was
usblp-add-serial-number-to-device-id.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
Subject: usblp: Add serial number to device ID
From: Dirk Eibach <eibach@xxxxxxxx>
I noticed that some USB-printers, e.g. Canon PIXMA iP3000 don't add their
serial number to the IEEE-1284 device ID string as expected by userspace
apps like cups. Because of this, connecting multiple printers of the same
type to a system does not work properly.
This patch adds the usb serial number to the device ID if it is left
out by the printer.
Signed-off-by: Dirk Eibach <eibach@xxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/class/usblp.c | 12 ++++++++++++
1 files changed, 12 insertions(+)
diff -puN drivers/usb/class/usblp.c~usblp-add-serial-number-to-device-id drivers/usb/class/usblp.c
--- a/drivers/usb/class/usblp.c~usblp-add-serial-number-to-device-id
+++ a/drivers/usb/class/usblp.c
@@ -1162,6 +1162,18 @@ static int usblp_cache_device_id_string(
length = USBLP_DEVICE_ID_SIZE - 1;
usblp->device_id_string[length] = '\0';
+ /* Insert serial number into the device ID string if the printer
+ * is braindead enough to leave it out. */
+ if ( (usblp->dev->serial)
+ && (length + strlen(usblp->dev->serial) + 6 < USBLP_DEVICE_ID_SIZE)
+ && !strstr(usblp->device_id_string+2, "SERN:")
+ && !strstr(usblp->device_id_string+2, "SER:") )
+ {
+ sprintf(usblp->device_id_string+length, "SERN:%s;", usblp->dev->serial);
+ length += 6 + strlen(usblp->dev->serial);
+ *((__be16 *)usblp->device_id_string) = cpu_to_be16(length);
+ }
+
dbg("usblp%d Device ID string [len=%d]=\"%s\"",
usblp->minor, length, &usblp->device_id_string[2]);
_
Patches currently in -mm which might be from eibach@xxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
