diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-17 15:50:35 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-17 15:50:35 -0800 |
commit | a660c1509ae85d386ab886c2627c8bc05933e0f3 (patch) | |
tree | a3e76f3f4e58e3d0a0fc5d3d137e522fe3a35feb /usb | |
parent | 9472c47f6199ce19729ce72ea447d5c78f3a961a (diff) | |
download | patches-a660c1509ae85d386ab886c2627c8bc05933e0f3.tar.gz |
pci usb and driver core fixes
Diffstat (limited to 'usb')
-rw-r--r-- | usb/usb-ftdi_sio-new-ids-for-kobil-devices.patch | 49 | ||||
-rw-r--r-- | usb/usb-sn9c10x-driver-bad-page-state-fix.patch | 46 |
2 files changed, 95 insertions, 0 deletions
diff --git a/usb/usb-ftdi_sio-new-ids-for-kobil-devices.patch b/usb/usb-ftdi_sio-new-ids-for-kobil-devices.patch new file mode 100644 index 0000000000000..e4d5b4376c990 --- /dev/null +++ b/usb/usb-ftdi_sio-new-ids-for-kobil-devices.patch @@ -0,0 +1,49 @@ +From ian.abbott@mev.co.uk Wed Nov 16 06:07:25 2005 +Message-ID: <437B4035.1090306@mev.co.uk> +Date: Wed, 16 Nov 2005 14:20:37 +0000 +From: Ian Abbott <abbotti@mev.co.uk> +Cc: Greg KH <greg@kroah.com> +Subject: USB: ftdi_sio: new IDs for KOBIL devices + +From: Ian Abbott <abbotti@mev.co.uk> + +This patch adds two new devices to the ftdi_sio driver's device ID +table. The device IDs were supplied by Stefan Nies of KOBIL Systems for +two of their devices using the FTDI chip. + +Signed-off-by: Ian Abbott <abbotti@mev.co.uk> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio.h | 7 +++++++ + 2 files changed, 9 insertions(+) + +--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c ++++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c +@@ -475,6 +475,8 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) }, ++ { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) }, ++ { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) }, + { }, /* Optional parameter entry */ + { } /* Terminating entry */ + }; +--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h ++++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h +@@ -128,6 +128,13 @@ + #define SEALEVEL_2803_8_PID 0X2883 /* SeaLINK+8 (2803) Port 8 */ + + /* ++ * The following are the values for two KOBIL chipcard terminals. ++ */ ++#define KOBIL_VID 0x0d46 /* KOBIL Vendor ID */ ++#define KOBIL_CONV_B1_PID 0x2020 /* KOBIL Konverter for B1 */ ++#define KOBIL_CONV_KAAN_PID 0x2021 /* KOBIL_Konverter for KAAN */ ++ ++/* + * DSS-20 Sync Station for Sony Ericsson P800 + */ + diff --git a/usb/usb-sn9c10x-driver-bad-page-state-fix.patch b/usb/usb-sn9c10x-driver-bad-page-state-fix.patch new file mode 100644 index 0000000000000..f8f6e76b5ad89 --- /dev/null +++ b/usb/usb-sn9c10x-driver-bad-page-state-fix.patch @@ -0,0 +1,46 @@ +From dwrobel@ertel.com.pl Wed Nov 16 12:05:26 2005 +Date: Wed, 16 Nov 2005 21:06:03 +0100 (CET) +From: Damian Wrobel <dwrobel@ertel.com.pl> +To: Greg Kroah-Hartman <gregkh@suse.de> +Cc: Luca Risolia <luca.risolia@studio.unibo.it> +Subject: USB: SN9C10x driver - bad page state fix +Message-ID: <Pine.LNX.4.58.0511162041160.18436@gormenghast.ertel.com.pl> + + +This patch solves the following problem I've already discovered on the +latest 2.6.15-rc1-git1 kernel: + +Nov 13 07:37:28 wrobel kernel: Bad page state at free_hot_cold_page (in process 'motion', page c164e020) +Nov 13 07:37:28 wrobel kernel: flags:0x40000400 mapping:00000000 mapcount:0 count:0 +Nov 13 07:37:28 wrobel kernel: Backtrace: +Nov 13 07:37:28 wrobel kernel: [<c0146d86>] bad_page+0x85/0xbe +Nov 13 07:37:28 wrobel kernel: [<c0147629>] free_hot_cold_page+0x54/0x129 +Nov 13 07:37:28 wrobel kernel: [<c01598c6>] __vunmap+0xa9/0xfe +Nov 13 07:37:28 wrobel kernel: [<c0154114>] vmalloc_to_page+0x34/0x55 +Nov 13 07:37:28 wrobel kernel: [<c0159942>] vfree+0x27/0x35 +Nov 13 07:37:28 wrobel kernel: [<f8a20292>] sn9c102_release_buffers+0x30/0x3f [sn9c102] +Nov 13 07:37:28 wrobel kernel: [<f8a231c2>] sn9c102_release+0x37/0xeb [sn9c102] +Nov 13 07:37:28 wrobel kernel: [<c0163e74>] __fput+0xa9/0x1aa +Nov 13 07:37:28 wrobel kernel: [<c01624f7>] filp_close+0x49/0x6d +Nov 13 07:37:30 wrobel kernel: [<c016258f>] sys_close+0x74/0x95 +Nov 13 07:37:30 wrobel kernel: [<c0102ef9>] syscall_call+0x7/0xb +Nov 13 07:37:31 wrobel kernel: Trying to fix it up, but a reboot is needed + +Signed-off-by: Damian Wrobel <dwrobel@ertel.com.pl> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/media/sn9c102_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- gregkh-2.6.orig/drivers/usb/media/sn9c102_core.c ++++ gregkh-2.6/drivers/usb/media/sn9c102_core.c +@@ -199,7 +199,7 @@ static void sn9c102_release_buffers(stru + { + if (cam->nbuffers) { + rvfree(cam->frame[0].bufmem, +- cam->nbuffers * cam->frame[0].buf.length); ++ cam->nbuffers * PAGE_ALIGN(cam->frame[0].buf.length)); + cam->nbuffers = 0; + } + } |