← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/wireless/b43/rfkill.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/b43/rfkill.c
37
37
{
38
38
        struct b43_wl *wl = hw_to_b43_wl(hw);
39
39
        struct b43_wldev *dev = wl->current_dev;
40
 
        struct ssb_bus *bus = dev->dev->bus;
 
40
        struct ssb_bus *bus = dev->sdev->bus;
41
41
        bool enabled;
42
42
        bool brought_up = false;
43
43
 
47
47
                        mutex_unlock(&wl->mutex);
48
48
                        return;
49
49
                }
50
 
                ssb_device_enable(dev->dev, 0);
 
50
                ssb_device_enable(dev->sdev, 0);
51
51
                brought_up = true;
52
52
        }
53
53
 
63
63
        }
64
64
 
65
65
        if (brought_up) {
66
 
                ssb_device_disable(dev->dev, 0);
 
66
                ssb_device_disable(dev->sdev, 0);
67
67
                ssb_bus_may_powerdown(bus);
68
68
        }
69
69