diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 06:42:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 06:42:20 +0200 |
| commit | 53971a86d2db89f32859dc26bd6594b5bc665d5b (patch) | |
| tree | 350ee9f3d53494036308cd123054dac3ba86ff91 /drivers/usb/wusbcore/mmc.c | |
| parent | usb: dwc2: fix sparse warning (diff) | |
| parent | Linux 3.15-rc3 (diff) | |
| download | linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.tar.xz linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.zip | |
Merge 3.15-rc3 into usb-next
Diffstat (limited to 'drivers/usb/wusbcore/mmc.c')
| -rw-r--r-- | drivers/usb/wusbcore/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c index 44741267c917..3f485df96226 100644 --- a/drivers/usb/wusbcore/mmc.c +++ b/drivers/usb/wusbcore/mmc.c @@ -301,7 +301,7 @@ int wusbhc_chid_set(struct wusbhc *wusbhc, const struct wusb_ckhdid *chid) if (chid) result = uwb_radio_start(&wusbhc->pal); - else + else if (wusbhc->uwb_rc) uwb_radio_stop(&wusbhc->pal); return result; |