Merge staging-next tree into Linus's latest version
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 May 2010 19:48:55 +0000 (12:48 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 May 2010 19:48:55 +0000 (12:48 -0700)
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>
31 files changed:
1  2 
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/das08_cs.c
drivers/staging/comedi/drivers/ni_daq_700.c
drivers/staging/comedi/drivers/ni_daq_dio24.c
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/comedi/drivers/quatech_daqp_cs.c
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-video-upstream.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/hv/netvsc_drv.c
drivers/staging/hv/rndis_filter.c
drivers/staging/iio/accel/lis3l02dq_ring.c
drivers/staging/iio/adc/max1363_core.c
drivers/staging/iio/industrialio-core.c
drivers/staging/iio/light/tsl2563.c
drivers/staging/rt2860/usb_main_dev.c
drivers/staging/rtl8192su/r8192U_core.c
drivers/staging/udlfb/udlfb.c
drivers/staging/usbip/stub_rx.c
drivers/staging/vme/bridges/vme_tsi148.c
drivers/staging/vt6655/device_main.c
drivers/staging/vt6655/rxtx.c
drivers/staging/vt6656/main_usb.c
drivers/staging/vt6656/rxtx.c
drivers/staging/winbond/wbusb.c
drivers/staging/wlags49_h2/wl_cs.c
drivers/staging/wlags49_h2/wl_netdev.c

Simple merge
Simple merge
index 30b522c0bf2c57b9f4c6032dbc1a35a8725642fd,19c60936e0121ea5cb52f2ea4dccf2d04fe5c956..cfeb11f443e340a322ad22759790540cab23e0fd
@@@ -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);
index 7ac2c6d8e9a33b343122959d6ff2b2a25a5c69c8,f31309bf52b01f53444fee3a05ff7d63dc5db3dc..40ef97f3feb5360431e3a66d9508e2e821f62d68
@@@ -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 */
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c9d99d88b7864c70d4feb8438e0c910402e5bc4a,568993f3ffe3064a7f3e2057ef363af7442b1979..10abd406b09b597d414ccd8daba91dce85085889
@@@ -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;