summaryrefslogtreecommitdiff
path: root/backend/usb-unix.c
diff options
context:
space:
mode:
authorjlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be>2006-11-16 17:01:30 +0000
committerjlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be>2006-11-16 17:01:30 +0000
commit411affcf6ae840dbe82786a1f42c16cb3127d20f (patch)
tree0cdee41b9d5f1506cf880182ea80cf30f0713be7 /backend/usb-unix.c
parent26d47ec6888969c3a3957f55c9eed0778813b94a (diff)
downloadcups-411affcf6ae840dbe82786a1f42c16cb3127d20f.tar.gz
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@245 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/usb-unix.c')
-rw-r--r--backend/usb-unix.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index 47b2cf1f0..4a4cbe259 100644
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,5 +1,5 @@
/*
- * "$Id: usb-unix.c 6032 2006-10-12 19:19:47Z mike $"
+ * "$Id: usb-unix.c 6111 2006-11-15 20:28:39Z mike $"
*
* USB port backend for the Common UNIX Printing System (CUPS).
*
@@ -84,8 +84,7 @@ print_device(const char *uri, /* I - Device URI */
* device ID over and over and over when they get a read request...
*/
- use_bc = strcasecmp(hostname, "Canon") != 0 ||
- strstr(hostname, "Minolta") != NULL;
+ use_bc = strcasecmp(hostname, "Canon") && !strstr(hostname, "Minolta");
if ((device_fd = open_device(uri, &use_bc)) == -1)
{
@@ -525,5 +524,5 @@ open_device(const char *uri, /* I - Device URI */
/*
- * End of "$Id: usb-unix.c 6032 2006-10-12 19:19:47Z mike $".
+ * End of "$Id: usb-unix.c 6111 2006-11-15 20:28:39Z mike $".
*/