diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/fsl_law.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/mmc.c | 8 | ||||
| -rw-r--r-- | drivers/net/phy/generic_10g.c | 1 | ||||
| -rw-r--r-- | drivers/net/tsec.c | 1 | 
4 files changed, 6 insertions, 8 deletions
| diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index 3233ff2e4..a7d04b7ea 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -247,13 +247,13 @@ void init_laws(void)  #error FSL_HW_NUM_LAWS can not be greater than 32 w/o code changes  #endif -	/*  +	/*  	 * Any LAWs that were set up before we booted assume they are meant to  	 * be around and mark them used.  	 */  	for (i = 0; i < FSL_HW_NUM_LAWS; i++) {  		u32 lawar = in_be32(LAWAR_ADDR(i)); -		 +  		if (lawar & LAW_EN)  			gd->used_laws |= (1 << i);  	} diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 1d089a7d1..21aedbaa3 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -434,14 +434,14 @@ int mmc_send_op_cond(struct mmc *mmc)   	cmd.resp_type = MMC_RSP_R3;   	cmd.cmdarg = 0;   	cmd.flags = 0; -  +   	err = mmc_send_cmd(mmc, &cmd, NULL); -  +   	if (err)   		return err; -  +   	udelay(1000); -  +  	do {  		cmd.cmdidx = MMC_CMD_SEND_OP_COND;  		cmd.resp_type = MMC_RSP_R3; diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c index 315c50867..60dec457b 100644 --- a/drivers/net/phy/generic_10g.c +++ b/drivers/net/phy/generic_10g.c @@ -102,4 +102,3 @@ struct phy_driver gen10g_driver = {  	.startup	= gen10g_startup,  	.shutdown	= gen10g_shutdown,  }; - diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 06e5834a9..78ffc95c5 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -593,4 +593,3 @@ int tsec_standard_init(bd_t *bis)  	return tsec_eth_init(bis, tsec_info, ARRAY_SIZE(tsec_info));  } - |