From 5b05b2a7e0598dc0599424a69a32335cca56a255 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 22 May 2011 12:47:06 +0200 Subject: [PATCH] compat-wireless: adapt rename of dev to sdev in b43 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 --- patches/09-threaded-irq.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index d0f1d650b2aa..acfe0434f8c3 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -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 -- 2.30.2