Return-Path: Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:46061 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752351AbbLWNQI (ORCPT ); Wed, 23 Dec 2015 08:16:08 -0500 Received: from ben by shadbolt.decadent.org.uk with local (Exim 4.84) (envelope-from ) id 1aBjGu-0006pJ-CV for stable@vger.kernel.org; Wed, 23 Dec 2015 13:16:05 +0000 Date: Wed, 23 Dec 2015 13:16:04 +0000 From: Ben Hutchings To: stable@vger.kernel.org Message-ID: <20151223131604.GW28542@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="VAM/tfeJyUfWz6bO" Content-Disposition: inline Subject: [PATCH 3.2-3.10] USB: ti_usb_3410_502: Fix ID table size Sender: stable-owner@vger.kernel.org List-ID: --VAM/tfeJyUfWz6bO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Commit 35a2fbc941ac ("USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable") failed to update the size of the ti_id_table_3410 array. This doesn't need to be fixed upstream following commit d7ece6515e12 ("USB: ti_usb_3410_5052: remove vendor/product module parameters") but should be fixed in stable branches older than 3.12. Signed-off-by: Ben Hutchings --- --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -164,7 +164,7 @@ static unsigned int product_5052_count; /* the array dimension is the number of default entries plus */ /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */ /* null entry */ -static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = { +static struct usb_device_id ti_id_table_3410[16+TI_EXTRA_VID_PID_COUNT+1] = { { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) }, --VAM/tfeJyUfWz6bO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBVnqek+e/yOyVhhEJAQoaixAArjr67GrvdrSUwXEDxoQGiSkvC/2hde2q ky7xV8/Q534w823ektJu6ReZZxIDi0wxafjnu3vGxjH9DWX5OItK51anAI5YFNAI 91Juvt0+kSwciiwWvAybVs3cyuqGj2hrNpPjUfdq1oW3DY6Ea0J2BVQDJpg0sE5t NYM0NzaUei6P0OyyflPi2nI/xIM1V/ZMwq3aG0EdhWFS4F97xKuqt+yB4wQQ8NcF ctiK/RBDwMpeUlh0soNB3JjmUzQ9l06TXJXtJgODUPtdlGDoTO3W4ygNOwKvs594 HxivHXRUWKrJsDSvMt9I4TQKrWCt5fDHVhCBSGj7KD3G5x3vyZO/kF1y7arPdArG rnEzpuliyrBCxaDLhNv/51gSMQbIEnLNbhiYqbbrF/mMDPfZIto5n8LxuLU5EuU2 hshPc4+8yzFZwGF7yEFoot8JJI77M1V34LjS4eaI9vO/bwagV4t4oiJEuYvS/ft+ eH1os5t9rd6Tn/hyYG2dafQpsmrRTHhvzbvWWS9UhqoyLtjvoNOCtuFwibIzEpVL k7Y8PLisfTYYLAyT6rXb4XNwZum5Q0aemo8ASI8PFTHEQ2o/I4yzeZXbgvvqeGuz /zVj0agMwbua6c0Sv6i8s56VNTAuansS5QCx9VGf4FQtCK6Ki5iellNK5+AMakMr z6poAvik5NE= =rXpU -----END PGP SIGNATURE----- --VAM/tfeJyUfWz6bO--