diff --git a/[refs] b/[refs] index 6e381d8d0665..31e2ea930d64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 193faea9280a809cc30e81d7e503e01b1d7b7042 +refs/heads/master: 64834b226b237e654ab164d3af88ceaa65f10362 diff --git a/trunk/drivers/char/stallion.c b/trunk/drivers/char/stallion.c index e45113a7a472..265abadcf776 100644 --- a/trunk/drivers/char/stallion.c +++ b/trunk/drivers/char/stallion.c @@ -2172,7 +2172,7 @@ static int __devinit stl_initech(struct stlbrd *brdp) } status = inb(ioaddr + ECH_PNLSTATUS); if ((status & ECH_PNLIDMASK) != nxtid) - goto err_fr; + break; panelp = kzalloc(sizeof(struct stlpanel), GFP_KERNEL); if (!panelp) { printk("STALLION: failed to allocate memory "