From: Greg Kroah-Hartman Date: Tue, 24 Aug 2010 18:43:08 +0000 (-0700) Subject: .27 patches X-Git-Tag: v2.6.32.21~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07c82147bd7ba6186f53a6d020394b288c2caca8;p=thirdparty%2Fkernel%2Fstable-queue.git .27 patches --- diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 2f7733a4886..33413c8a9e7 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -4,3 +4,5 @@ selinux-use-default-proc-sid-on-symlinks.patch can-add-limit-for-nframes-and-clean-up-signed-unsigned-variables.patch fixes-for-using-make-3.82.patch drm-stop-information-leak-of-old-kernel-stack.patch +usb-add-device-ids-for-igotu-to-navman.patch +usb-io_ti-check-firmware-version-before-updating.patch diff --git a/queue-2.6.27/usb-add-device-ids-for-igotu-to-navman.patch b/queue-2.6.27/usb-add-device-ids-for-igotu-to-navman.patch new file mode 100644 index 00000000000..357a59d783c --- /dev/null +++ b/queue-2.6.27/usb-add-device-ids-for-igotu-to-navman.patch @@ -0,0 +1,42 @@ +From 0eee6a2b2a52e17066a572d30ad2805d3ebc7508 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 6 Aug 2010 16:36:39 +0100 +Subject: USB: add device IDs for igotu to navman + +From: Ross Burton + +commit 0eee6a2b2a52e17066a572d30ad2805d3ebc7508 upstream. + +I recently bought a i-gotU USB GPS, and whilst hunting around for linux +support discovered this post by you back in 2009: + +http://kerneltrap.org/mailarchive/linux-usb/2009/3/12/5148644 + +>Try the navman driver instead. You can either add the device id to the +> driver and rebuild it, or do this before you plug the device in: +> modprobe navman +> echo -n "0x0df7 0x0900" > /sys/bus/usb-serial/drivers/navman/new_id +> +> and then plug your device in and see if that works. + +I can confirm that the navman driver works with the right device IDs on +my i-gotU GT-600, which has the same device IDs. Attached is a patch +adding the IDs. + +From: Ross Burton +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/navman.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/navman.c ++++ b/drivers/usb/serial/navman.c +@@ -24,6 +24,7 @@ static int debug; + + static struct usb_device_id id_table [] = { + { USB_DEVICE(0x0a99, 0x0001) }, /* Talon Technology device */ ++ { USB_DEVICE(0x0df7, 0x0900) }, /* Mobile Action i-gotU */ + { }, + }; + MODULE_DEVICE_TABLE(usb, id_table); diff --git a/queue-2.6.27/usb-io_ti-check-firmware-version-before-updating.patch b/queue-2.6.27/usb-io_ti-check-firmware-version-before-updating.patch new file mode 100644 index 00000000000..096af64414e --- /dev/null +++ b/queue-2.6.27/usb-io_ti-check-firmware-version-before-updating.patch @@ -0,0 +1,36 @@ +From 0827a9ff2bbcbb03c33f1a6eb283fe051059482c Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 17 Aug 2010 15:15:37 -0700 +Subject: USB: io_ti: check firmware version before updating + +From: Greg Kroah-Hartman + +commit 0827a9ff2bbcbb03c33f1a6eb283fe051059482c upstream. + +If we can't read the firmware for a device from the disk, and yet the +device already has a valid firmware image in it, we don't want to +replace the firmware with something invalid. So check the version +number to be less than the current one to verify this is the correct +thing to do. + + +Reported-by: Chris Beauchamp +Tested-by: Chris Beauchamp +Cc: Alan Stern +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/io_ti.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/serial/io_ti.c ++++ b/drivers/usb/serial/io_ti.c +@@ -1156,7 +1156,7 @@ static int download_fw(struct edgeport_s + + /* Check if we have an old version in the I2C and + update if necessary */ +- if (download_cur_ver != download_new_ver) { ++ if (download_cur_ver < download_new_ver) { + dbg("%s - Update I2C dld from %d.%d to %d.%d", + __func__, + firmware_version->Ver_Major,