From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 21 May 2010 19:48:55 +0000 (-0700)
Subject: Merge staging-next tree into Linus's latest version
X-Git-Tag: v2.6.35-rc1~441^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c8d1a126924fcbc1d61ceb830226e0c7afdcc841

Merge staging-next tree into Linus's latest version

Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

c8d1a126924fcbc1d61ceb830226e0c7afdcc841
diff --cc drivers/staging/comedi/drivers/cb_das16_cs.c
index 30b522c0bf2c,19c60936e012..cfeb11f443e3
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@@ -175,17 -175,17 +175,18 @@@ static int das16cs_attach(struct comedi
  	printk("I/O base=0x%04lx ", dev->iobase);
  
  	printk("fingerprint:\n");
- 	for (i = 0; i < 48; i += 2) {
+ 	for (i = 0; i < 48; i += 2)
  		printk("%04x ", inw(dev->iobase + i));
- 	}
+ 
  	printk("\n");
  
 -	ret = request_irq(link->irq.AssignedIRQ, das16cs_interrupt,
 +	ret = request_irq(link->irq, das16cs_interrupt,
  			  IRQF_SHARED, "cb_das16_cs", dev);
- 	if (ret < 0) {
+ 	if (ret < 0)
  		return ret;
- 	}
+ 
 -	dev->irq = link->irq.AssignedIRQ;
 +	dev->irq = link->irq;
++
  	printk("irq=%u ", dev->irq);
  
  	dev->board_ptr = das16cs_probe(dev, link);
diff --cc drivers/staging/dt3155/dt3155_drv.c
index 7ac2c6d8e9a3,f31309bf52b0..40ef97f3feb5
--- a/drivers/staging/dt3155/dt3155_drv.c
+++ b/drivers/staging/dt3155/dt3155_drv.c
@@@ -464,9 -465,9 +465,9 @@@ static void dt3155_init_isr(int minor
    /* 50/60 Hz should be set before this point but let's make sure it is */
    /* right anyway */
  
-   ReadI2C(dt3155_lbase[ minor ], CSR2, &i2c_csr2.reg);
 -  ReadI2C(dt3155_lbase[minor], CONFIG, &i2c_csr2.reg);
++  ReadI2C(dt3155_lbase[minor], CSR2, &i2c_csr2.reg);
    i2c_csr2.fld.HZ50 = FORMAT50HZ;
-   WriteI2C(dt3155_lbase[ minor ], CSR2, i2c_csr2.reg);
 -  WriteI2C(dt3155_lbase[minor], CONFIG, i2c_config.reg);
++  WriteI2C(dt3155_lbase[minor], CSR2, i2c_csr2.reg);
  
    /* enable busmaster chip, clear flags */
  
diff --cc drivers/staging/wlags49_h2/wl_cs.c
index c9d99d88b786,568993f3ffe3..10abd406b09b
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@@ -314,15 -310,22 +307,22 @@@ void wl_adapter_insert( struct pcmcia_d
      /* Do we need to allocate an interrupt? */
      link->conf.Attributes |= CONF_ENABLE_IRQ;
  
-     CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
-     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
-     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+     ret = pcmcia_request_io(link, &link->io);
+     if (ret != 0)
+         goto failed;
+ 
+     ret = pcmcia_request_irq(link, (void *) wl_isr);
+     if (ret != 0)
+         goto failed;
  
+     ret = pcmcia_request_configuration(link, &link->conf);
+     if (ret != 0)
+         goto failed;
  
 -    dev->irq        = link->irq.AssignedIRQ;
 +    dev->irq        = link->irq;
      dev->base_addr  = link->io.BasePort1;
  
-     SET_NETDEV_DEV(dev, &handle_to_dev(link));
+     SET_NETDEV_DEV(dev, &link->dev);
      if (register_netdev(dev) != 0) {
  	printk("%s: register_netdev() failed\n", MODULE_NAME);
  	goto failed;