diff mbox

[01/11] tty: serial: add missing braces

Message ID 1395343807-21618-1-git-send-email-balbi@ti.com
State Accepted
Commit 5b6acc79252e65a2bc3181a55d45c8e7b6f7876c
Headers show

Commit Message

Felipe Balbi March 20, 2014, 7:29 p.m. UTC
per CodingStyle we should have those braces, no
functional changes.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/tty/serial/omap-serial.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Felipe Balbi April 22, 2014, 2:22 p.m. UTC | #1
Hi,

On Thu, Mar 20, 2014 at 02:29:57PM -0500, Felipe Balbi wrote:
> per CodingStyle we should have those braces, no
> functional changes.
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>

Greg, do you want me to refresh and resend this series ?
Greg KH April 23, 2014, 12:28 a.m. UTC | #2
On Tue, Apr 22, 2014 at 09:22:56AM -0500, Felipe Balbi wrote:
> Hi,
> 
> On Thu, Mar 20, 2014 at 02:29:57PM -0500, Felipe Balbi wrote:
> > per CodingStyle we should have those braces, no
> > functional changes.
> > 
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
> 
> Greg, do you want me to refresh and resend this series ?

If there are conflicts with my current tree, sure, I'd love to have
that.  I should be trying to dig out from my patch backlog for 3.16-rc1
by the end of this week...

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi April 23, 2014, 2:53 p.m. UTC | #3
On Tue, Apr 22, 2014 at 05:28:43PM -0700, Greg KH wrote:
> On Tue, Apr 22, 2014 at 09:22:56AM -0500, Felipe Balbi wrote:
> > Hi,
> > 
> > On Thu, Mar 20, 2014 at 02:29:57PM -0500, Felipe Balbi wrote:
> > > per CodingStyle we should have those braces, no
> > > functional changes.
> > > 
> > > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > 
> > Greg, do you want me to refresh and resend this series ?
> 
> If there are conflicts with my current tree, sure, I'd love to have
> that.  I should be trying to dig out from my patch backlog for 3.16-rc1
> by the end of this week...

then I'll resend rebased on -rc2, should make your life a little easier,
hopefully.

cheers
diff mbox

Patch

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 77f0351..73abba8 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1677,8 +1677,10 @@  static int serial_omap_probe(struct platform_device *pdev)
 	    omap_up_info->DTR_present) {
 		up->DTR_gpio = omap_up_info->DTR_gpio;
 		up->DTR_inverted = omap_up_info->DTR_inverted;
-	} else
+	} else {
 		up->DTR_gpio = -EINVAL;
+	}
+
 	up->DTR_active = 0;
 
 	up->dev = &pdev->dev;
@@ -1740,6 +1742,7 @@  static int serial_omap_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, up);
 	if (omap_up_info->autosuspend_timeout == 0)
 		omap_up_info->autosuspend_timeout = -1;
+
 	device_init_wakeup(up->dev, true);
 	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_set_autosuspend_delay(&pdev->dev,