From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: build failure after merge of the final tree (tty tree related) Date: Thu, 26 Jul 2012 08:52:16 +1000 Message-ID: <20120726085216.2ee021b6e10aebe6a853d091@canb.auug.org.au> References: <20120720150237.af0d271624511fc18705f287@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__26_Jul_2012_08_52_16_+1000_XZA.4LYB6xqW6/Rj" Return-path: Received: from haggis.pcug.org.au ([203.10.76.10]:56904 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551Ab2GYWwT (ORCPT ); Wed, 25 Jul 2012 18:52:19 -0400 In-Reply-To: <20120720150237.af0d271624511fc18705f287@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alan Cox --Signature=_Thu__26_Jul_2012_08_52_16_+1000_XZA.4LYB6xqW6/Rj Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Greg, Alan, On Fri, 20 Jul 2012 15:02:37 +1000 Stephen Rothwell = wrote: > > After merging the final tree, today's linux-next build (powerpc > allyesconfig) failed like this: >=20 > drivers/usb/serial/console.c: In function 'usb_console_setup': > drivers/usb/serial/console.c:168:16: error: invalid type argument of '->'= (have 'struct ktermios') > drivers/usb/serial/console.c:169:4: error: incompatible type for argument= 1 of 'tty_termios_encode_baud_rate' > include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argume= nt is of type 'struct ktermios' >=20 > Caused by commit adc8d746caa6 ("tty: move the termios object into the > tty"). Hopefully this is the last of them. >=20 > I have added the following fix patch for today: >=20 > From: Stephen Rothwell > Date: Fri, 20 Jul 2012 14:58:31 +1000 > Subject: [PATCH] tty: fix up usb serial console for termios change. >=20 > fixes these errors: >=20 > drivers/usb/serial/console.c: In function 'usb_console_setup': > drivers/usb/serial/console.c:168:16: error: invalid type argument of '->'= (have 'struct ktermios') > drivers/usb/serial/console.c:169:4: error: incompatible type for argument= 1 of 'tty_termios_encode_baud_rate' > include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argume= nt is of type 'struct ktermios' >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/usb/serial/console.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c > index b9cca6d..9a56428 100644 > --- a/drivers/usb/serial/console.c > +++ b/drivers/usb/serial/console.c > @@ -165,8 +165,8 @@ static int usb_console_setup(struct console *co, char= *options) > } > =20 > if (serial->type->set_termios) { > - tty->termios->c_cflag =3D cflag; > - tty_termios_encode_baud_rate(tty->termios, baud, baud); > + tty->termios.c_cflag =3D cflag; > + tty_termios_encode_baud_rate(&tty->termios, baud, baud); > memset(&dummy, 0, sizeof(struct ktermios)); > serial->type->set_termios(tty, port, &dummy); > =20 > --=20 > 1.7.10.280.gaa39 Ping? --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Thu__26_Jul_2012_08_52_16_+1000_XZA.4LYB6xqW6/Rj Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJQEHigAAoJEECxmPOUX5FE4HwQAJ5sD9rHD7NTBYV0CjRO8HC2 mqMZYaTNH/lUET9XqTEOXH0Bq6GijP1xQtN1ZOMCbvzrkMOEu5bpT97Q1JyKZLEn Vdm3lZ3mh/RdHQz1CnqrLXyoE5GZQXDcAlPeIVNZWcWNElEP2PAgyZ9Z5HuG2xgc wNWPwzb3bUdkPD0CeUHMksM2FfypShxIPHVXmUYO1j1zfCGgm18uxJ9fQDAPwFLF +OMdyS96GgRvaSBKA3c58hkJWkDmEPgxteCyTuXOZMAnrtEnccanQ5VzQ2wAG0VM dsuHHfLdJK1g2RfG0VGOtcvRm67B+peUxACvPUqm3l7A3dLdsfm/CJfI3+0VnovN rV6F1/z+7yCmkeZqBxp4ZF2O1cLYRUyVqi4bmX93hLTUHb3eD87E607evhtajS+D wiYXQnCWlJbY7B7duBoMuFX274ty8FMVhmSYRA7JAamIOmUYcmTD2DE4gM8fspBO s9/iPO8hcXaKw6MoLYFqDulTj+EfcXRj6UEvv3vACiMawMauPqKnCm8weXosJTkH 0LlrmEjekNWRWk0ArJbe/Mo9ZxxbbtSYr6UguiV/QYCnC7JZAuwxbxsizQ5a6Q3+ hLPLglIwyA7K2tqDG1GfFhxq4vuFSGp2FnCZ3b7cuFRtebYhsN7dJHUwaqdTEt6v 6E5+179c5PBecJ/O/9wk =29QH -----END PGP SIGNATURE----- --Signature=_Thu__26_Jul_2012_08_52_16_+1000_XZA.4LYB6xqW6/Rj--