compat-wireless: adapt rename of dev to sdev in b43
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 22 May 2011 10:47:06 +0000 (12:47 +0200)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Mon, 23 May 2011 21:05:28 +0000 (14:05 -0700)
Adapt changes from "b43: rename b43_wldev's field with ssb_device to sdev"

This was missing in commit "compat-wireless: fix applying of 09-threaded-irq.patch"

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/09-threaded-irq.patch

index d0f1d650b2aaafac98d04d8e3dc7d4fabe485dab..acfe0434f8c3d0b005c3ec40a33fb1520c61f743 100644 (file)
@@ -26,7 +26,7 @@ thread in process context as well.
        } else {
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
 +              err = compat_request_threaded_irq(&dev->irq_compat,
-+                                                dev->dev->irq,
++                                                dev->sdev->irq,
 +                                                b43_interrupt_handler,
 +                                                b43_interrupt_thread_handler,
 +                                                IRQF_SHARED, KBUILD_MODNAME, dev);
@@ -43,7 +43,7 @@ thread in process context as well.
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
-+      if (dev->dev->bus->bustype != SSB_BUSTYPE_SDIO)
++      if (dev->sdev->bus->bustype != SSB_BUSTYPE_SDIO)
 +              compat_destroy_threaded_irq(&dev->irq_compat);
 +#endif
        /* We release firmware that late to not be required to re-request