From 61ba9644d2f41aaad8fa1bd644fd753cc093a4aa Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Wed, 12 Sep 2012 14:55:40 +0200 Subject: [PATCH] --- yaml --- r: 325245 b: refs/heads/master c: 2afb41d9d30d33504c47a5dda3eeade692f388dc h: refs/heads/master i: 325243: 0ad6ee30990165ae5fb34bde3a8a5774d64ce1dc v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/devices/ipoctal.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7446509ad6b3..4c44d6df9ab7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1adda49706ff832e9fc4f4bcb62d38285145307c +refs/heads/master: 2afb41d9d30d33504c47a5dda3eeade692f388dc diff --git a/trunk/drivers/staging/ipack/devices/ipoctal.c b/trunk/drivers/staging/ipack/devices/ipoctal.c index b84ab5eb4b11..737127033cff 100644 --- a/trunk/drivers/staging/ipack/devices/ipoctal.c +++ b/trunk/drivers/staging/ipack/devices/ipoctal.c @@ -437,6 +437,8 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, ipoctal->tty_drv = tty; for (i = 0; i < NR_CHANNELS; i++) { + struct device *tty_dev; + channel = &ipoctal->channel[i]; tty_port_init(&channel->tty_port); tty_port_alloc_xmit_buf(&channel->tty_port); @@ -450,7 +452,11 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, channel->pointer_read = 0; channel->pointer_write = 0; channel->nb_bytes = 0; - tty_register_device(tty, i, NULL); + tty_dev = tty_register_device(tty, i, NULL); + if (IS_ERR(tty_dev)) { + dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n"); + continue; + } /* * Enable again the RX. TX will be enabled when