aboutsummaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2013-03-03 20:04:36 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2013-03-03 20:04:36 +0000
commit571d570e1be6f783a2e8ef0dafa838e9d82f923e (patch)
tree9b18682751acba56d650129922ecc4c5f12a3469 /linux
parent62172377c57ff85bce35a43e0ca3e76f67a473ad (diff)
parent4e6290d8e2dc4dcd784102bdab18d7e1854e11c0 (diff)
downloadlibphidget21-571d570e1be6f783a2e8ef0dafa838e9d82f923e.tar.gz
Merge branch 'master' into squeeze-backportssqueeze-backports
Conflicts: debian/changelog
Diffstat (limited to 'linux')
-rw-r--r--linux/cusblinux-1.0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/cusblinux-1.0.c b/linux/cusblinux-1.0.c
index 0e3a5e8..8ac2381 100644
--- a/linux/cusblinux-1.0.c
+++ b/linux/cusblinux-1.0.c
@@ -540,7 +540,7 @@ int CUSBBuildList(CPhidgetList **curList) {
} //if(udev)
else
{
- LOG(PHIDGET_LOG_WARNING, "libusb_open failed with error code: %d", ret);
+ LOG(PHIDGET_LOG_WARNING, "libusb_open failed in CUSBBuildList with error code: %d", ret);
LOG(PHIDGET_LOG_INFO, "This usually means you need to run as root, or install the udev rules.");
free(phid);
libusb_close(handle);
@@ -748,7 +748,7 @@ int CUSBOpenHandle(CPhidgetHandle phid)
} /* udev open */
else
{
- LOG(PHIDGET_LOG_WARNING, "libusb_open failed with error code: %d", ret);
+ LOG(PHIDGET_LOG_WARNING, "libusb_open failed in CUSBOpenHandle with error code: %d", ret);
LOG(PHIDGET_LOG_INFO, "This usually means you need to run as root, or install the udev rules.");
libusb_close(handle);
}