Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0f6d87 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[PATCH] WAN/pc300: handle, propagate minor errors 



- move definition of 'tmc' and 'br' locals closer to usage

- handle clock_rate_calc() error

- propagate errors back to upper level open routine

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 718ecac2

drivers/net/wan/pc300_drv.c

+19 −5
Original line number Diff line number Diff line
@@ -2867,7 +2867,6 @@ static int ch_config(pc300dev_t * d) 
	uclong clktype = chan->conf.phys_settings.clock_type;

	ucshort encoding = chan->conf.proto_settings.encoding;

	ucshort parity = chan->conf.proto_settings.parity;   

	int tmc, br;

	ucchar md0, md2;

    

	/* Reset the channel */
@@ -2940,8 +2939,12 @@ static int ch_config(pc300dev_t * d) 
		case PC300_RSV:

		case PC300_X21:

			if (clktype == CLOCK_INT || clktype == CLOCK_TXINT) {

				int tmc, br;



				/* Calculate the clkrate parameters */

				tmc = clock_rate_calc(clkrate, card->hw.clock, &br);

				if (tmc < 0)

					return -EIO;

				cpc_writeb(scabase + M_REG(TMCT, ch), tmc);

				cpc_writeb(scabase + M_REG(TXS, ch),

					   (TXS_DTRXC | TXS_IBRG | br));
@@ -3097,14 +3100,16 @@ static int cpc_attach(struct net_device *dev, unsigned short encoding, 
	return 0;

}



static void cpc_opench(pc300dev_t * d)

static int cpc_opench(pc300dev_t * d)

{

	pc300ch_t *chan = (pc300ch_t *) d->chan;

	pc300_t *card = (pc300_t *) chan->card;

	int ch = chan->channel;

	int ch = chan->channel, rc;

	void __iomem *scabase = card->hw.scabase;



	ch_config(d);

	rc = ch_config(d);

	if (rc)

		return rc;



	rx_config(d);
@@ -3113,6 +3118,8 @@ static void cpc_opench(pc300dev_t * d) 
	/* Assert RTS and DTR */

	cpc_writeb(scabase + M_REG(CTL, ch),

		   cpc_readb(scabase + M_REG(CTL, ch)) & ~(CTL_RTS | CTL_DTR));



	return 0;

}



static void cpc_closech(pc300dev_t * d)
@@ -3168,9 +3175,16 @@ int cpc_open(struct net_device *dev) 
	}



	sprintf(ifr.ifr_name, "%s", dev->name);

	cpc_opench(d);

	result = cpc_opench(d);

	if (result)

		goto err_out;



	netif_start_queue(dev);

	return 0;



err_out:

	hdlc_close(dev);

	return result;

}



static int cpc_close(struct net_device *dev)