From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + imx-bit-confusion.patch added to -mm tree Date: Mon, 23 Nov 2009 15:50:02 -0800 Message-ID: <200911232350.nANNo2ml013338@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:52323 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756973AbZKWXvS (ORCPT ); Mon, 23 Nov 2009 18:51:18 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: roel.kluin@gmail.com, alan@linux.intel.com, dg@emlix.com, fg@emlix.com, os@emlix.com, rmk@arm.linux.org.uk, s.hauer@pengutronix.de The patch titled imx: bit &/| confusion has been added to the -mm tree. Its filename is imx-bit-confusion.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: imx: bit &/| confusion From: Roel Kluin Since UCR1_UARTEN is defined 1, the port was always treated as enabled. Signed-off-by: Roel Kluin Cc: Alan Cox Cc: Oskar Schirmer Cc: Sascha Hauer Cc: Fabian Godehardt Cc: Cc: Russell King Signed-off-by: Andrew Morton --- drivers/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/serial/imx.c~imx-bit-confusion drivers/serial/imx.c --- a/drivers/serial/imx.c~imx-bit-confusion +++ a/drivers/serial/imx.c @@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port int *parity, int *bits) { - if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) { + if (readl(sport->port.membase + UCR1) & UCR1_UARTEN) { /* ok, the port was enabled */ unsigned int ucr2, ubir,ubmr, uartclk; unsigned int baud_raw; _ Patches currently in -mm which might be from roel.kluin@gmail.com are thinkpad-acpi-fix-sign-of-erestartsys-return.patch linux-next.patch v4l-dvb-mxl5007tc-fix-test-in-copy_reg_bits.patch fujitsu-laptop-fix-tests-of-acpi_evaluate_integer-return.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch sms-cards-make-id-unsigned-in-sms_get_board.patch mtd-error-return-eio-instead-of-eio.patch imx-bit-confusion.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch ibmmca-buffer-overflow.patch scsi-eata-fix-buffer-overflow.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-u14-34fc-fix-uffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch zfcp-test-kmalloc-failure-in-scsi_get_vpd_page.patch st-fix-test-of-value-range-in-st_set_options.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch r8192u_core-test-for-negative-error-in-rtl8192_rx_isr.patch page-types-unsigned-cannot-be-less-than-0-in-add_page.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch cryptocop-fix-assertion-in-create_output_descriptors.patch gpio-fix-test-on-unsigned-in-lnw_irq_type.patch fbdev-tv_paln-bit-set-twice-in-sisfb_detect_vb_connect.patch hvc_console-fix-test-on-unsigned-in-hvc_console_print.patch irq-fix-test-in-__exit-parport_mfc3_exit.patch zlib-optimize-inffast-when-copying-direct-from-output.patch