diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-20 11:32:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-20 13:05:20 +1000 |
| commit | 2c33ce009ca2389dbf0535d0672214d09738e35e (patch) | |
| tree | 6186a6458c3c160385d794a23eaf07c786a9e61b /drivers/uwb/whci.c | |
| parent | cec32a47010647e8b0603726ebb75b990a4057a4 (diff) | |
| parent | 09d51602cf84a1264946711dd4ea0dddbac599a1 (diff) | |
| download | linux-stable-2c33ce009ca2389dbf0535d0672214d09738e35e.tar.gz linux-stable-2c33ce009ca2389dbf0535d0672214d09738e35e.tar.bz2 linux-stable-2c33ce009ca2389dbf0535d0672214d09738e35e.zip | |
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.
I've included the patch into the merge to fix the build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/uwb/whci.c')
| -rw-r--r-- | drivers/uwb/whci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c index 46b7cfcdfbca..c3ee39a04ea8 100644 --- a/drivers/uwb/whci.c +++ b/drivers/uwb/whci.c @@ -133,8 +133,7 @@ static void whci_del_cap(struct whci_card *card, int n) { struct umc_dev *umc = card->devs[n]; - if (umc != NULL) - umc_device_unregister(umc); + umc_device_unregister(umc); } static int whci_n_caps(struct pci_dev *pci) |