From: Daeseok Youn Date: Mon, 2 Jun 2014 05:06:53 +0000 (+0900) Subject: staging: dgap: remove bogus null test in dgap_tty_init() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e74c2ddcbbc3ecfc55c246b3da3c5320fe46d8e3;p=deliverable%2Flinux.git staging: dgap: remove bogus null test in dgap_tty_init() - The channels array were set to NULL in dgap_found_board(). - Removes redundant null check for channels array in for loop, if one of the channel cannot be allocated, dgap_tty_init() just returns an error. Signed-off-by: Daeseok Youn Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 5556a6ec8a12..fcfa061cb5e2 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -1379,12 +1379,10 @@ static int dgap_tty_init(struct board_t *brd) * when the driver was first loaded. */ for (i = 0; i < brd->nasync; i++) { - if (!brd->channels[i]) { - brd->channels[i] = - kzalloc(sizeof(struct channel_t), GFP_KERNEL); - if (!brd->channels[i]) - return -ENOMEM; - } + brd->channels[i] = + kzalloc(sizeof(struct channel_t), GFP_KERNEL); + if (!brd->channels[i]) + return -ENOMEM; } ch = brd->channels[0]; @@ -1398,9 +1396,6 @@ static int dgap_tty_init(struct board_t *brd) /* Set up channel variables */ for (i = 0; i < brd->nasync; i++, ch = brd->channels[i], bs++) { - if (!brd->channels[i]) - continue; - spin_lock_init(&ch->ch_lock); /* Store all our magic numbers */