diff options
author | Richard Hughes <richard@hughsie.com> | 2011-03-14 11:01:12 +0000 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2011-03-14 11:01:12 +0000 |
commit | b0bbb29df1363e4c7c51564506b45b42bf71137c (patch) | |
tree | 72ac863af4385796aec52b31eb05078692f7018b /etc | |
parent | 6e8794ac6d2603cda9f2544bb7c9dde7033c9e92 (diff) | |
download | upower-b0bbb29df1363e4c7c51564506b45b42bf71137c.tar.gz |
Add a config option 'EnableWattsUpPro' to disable the Watts Up Pro device
Annoyingly, the device used in the Watts Up Pro device seems to be a generic
USB->serial adaptor, which means it doesn't have a unique vendor and product
ID. If we try to probe for the WUP device, we can actually upset other devices
that are not expecing to be probed. This fixes #33846 although we actually
still need to be more strict in detecting a true WUP device.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/UPower.conf | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/etc/UPower.conf b/etc/UPower.conf index c82827a..ca120dc 100644 --- a/etc/UPower.conf +++ b/etc/UPower.conf @@ -20,6 +20,20 @@ SleepTimeout=1000 # default=true AllowHibernateEncryptedSwap=true +# Enable the Watts Up Pro device. +# +# The Watts Up Pro contains a generic FTDI USB device without a specific +# vendor and product ID. When we probe for WUP devices, we can cause +# the user to get a perplexing "Device or resource busy" error when +# attempting to use their non-WUP device. +# +# The generic FTDI device is known to also be used on: +# +# - Sparkfun FT232 breakout board +# - Parallax Propeller +# +# default=true +EnableWattsUpPro=true # Poll the kernel for dock state changes. # |