From 0d7e5dc84eae013f772824666456ce560b8169cd Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 29 Apr 2010 12:59:04 +0200 Subject: [PATCH] --- yaml --- r: 195425 b: refs/heads/master c: a78f4f1a16d87f3d33158d036af94e48e32f8aad h: refs/heads/master i: 195423: babe2f7d3e429061a641dc886626514444742ad6 v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/unusual_devs.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9cb81a876c9d..324d650bdc09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88e3b59b5adce5b12e205af0e34d518ba0dcdc0c +refs/heads/master: a78f4f1a16d87f3d33158d036af94e48e32f8aad diff --git a/trunk/drivers/usb/storage/unusual_devs.h b/trunk/drivers/usb/storage/unusual_devs.h index b402d5f27272..2c897eefadde 100644 --- a/trunk/drivers/usb/storage/unusual_devs.h +++ b/trunk/drivers/usb/storage/unusual_devs.h @@ -1844,6 +1844,21 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), +/* Reported by Hans de Goede + * These Appotech controllers are found in Picture Frames, they provide a + * (buggy) emulation of a cdrom drive which contains the windows software + * Uploading of pictures happens over the corresponding /dev/sg device. */ +UNUSUAL_DEV( 0x1908, 0x1315, 0x0000, 0x0000, + "BUILDWIN", + "Photo Frame", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_BAD_SENSE ), +UNUSUAL_DEV( 0x1908, 0x1320, 0x0000, 0x0000, + "BUILDWIN", + "Photo Frame", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_BAD_SENSE ), + UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001, "ST", "2A",