summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-24 08:42:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-24 08:42:49 -0800
commit70580b20bc8485002df0b3e89e42754c8c9796ff (patch)
treef5e6e751fa538c0d9852cb665bdc76b6ad6a0eac /fastboot
parent546dc10c1a7c6fb348507899d3629af01b4e4c43 (diff)
parent149ae11fb63818b470156e1652abfad0e08d486d (diff)
downloadsystem_core-70580b20bc8485002df0b3e89e42754c8c9796ff.zip
system_core-70580b20bc8485002df0b3e89e42754c8c9796ff.tar.gz
system_core-70580b20bc8485002df0b3e89e42754c8c9796ff.tar.bz2
am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"
* commit '149ae11fb63818b470156e1652abfad0e08d486d': adb,fastboot: add USB support for Intel Vendor ID
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/fastboot.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 4a2de20..fe0af7a 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -150,6 +150,7 @@ int match_fastboot(usb_ifc_info *info)
{
if(!(vendor_id && (info->dev_vendor == vendor_id)) &&
(info->dev_vendor != 0x18d1) && // Google
+ (info->dev_vendor != 0x8087) && // Intel
(info->dev_vendor != 0x0451) &&
(info->dev_vendor != 0x0502) &&
(info->dev_vendor != 0x0fce) && // Sony Ericsson