linux-next: manual merge of the char-misc tree with the char-misc.current tree

[Mark Brown]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/gpib/cb7210/cb7210.c

between commit:

  2eae90a457baa ("gpib: cb7210: Fix region leak when request_irq fails")

from the char-misc.current tree and commit:

  5ad2849605585 ("gpib: cb7210: Fix region leak when request_irq fails")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/gpib/cb7210/cb7210.c
index 673b5bfe2e7d1,05058bf2cd50b..0000000000000
--- a/drivers/gpib/cb7210/cb7210.c
+++ b/drivers/gpib/cb7210/cb7210.c
@@@ -1049,8 -1049,7 +1049,8 @@@ static int cb_isa_attach(struct gpib_bo
  	if (!request_region(config->ibbase, cb7210_iosize, DRV_NAME)) {
  		dev_err(board->gpib_dev, "ioports starting at 0x%x are already in use\n",
  			config->ibbase);
 -		return -EBUSY;
 +		retval = -EBUSY;
 +		goto err_release_region;
  	}
  	nec_priv->iobase = config->ibbase;
  	cb_priv->fifo_iobase = nec7210_iobase(cb_priv);
@@@ -1063,16 -1062,12 +1063,16 @@@
  	// install interrupt handler
  	if (request_irq(config->ibirq, cb7210_interrupt, isr_flags, DRV_NAME, board)) {
  		dev_err(board->gpib_dev, "failed to obtain IRQ %d\n", config->ibirq);
 -		release_region(nec7210_iobase(cb_priv), cb7210_iosize);
 -		return -EBUSY;
 +		retval = -EBUSY;
 +		goto err_release_region;
  	}
  	cb_priv->irq = config->ibirq;
  
  	return cb7210_init(cb_priv, board);
 +
 +err_release_region:
 +	release_region(nec7210_iobase(cb_priv), cb7210_iosize);
 +	return retval;
  }
  
  static void cb_isa_detach(struct gpib_board *board)

Attachment: signature.asc
Description: PGP signature