diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-09 01:41:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-09 01:41:58 +0300 |
| commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
| tree | f1958f80f596cfcf496904f12a62662fa79ce990 /drivers/gpio/gpio-xgene.c | |
| parent | 39ec5cbed0bb1878d0b65af0c5e653e37e1945a5 (diff) | |
| parent | d48d5691ebf88a15d95ba96486917ffc79256536 (diff) | |
| download | linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.tar.xz | |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/gpio/gpio-xgene.c')
| -rw-r--r-- | drivers/gpio/gpio-xgene.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c index c0aa387664bf..0dc916191689 100644 --- a/drivers/gpio/gpio-xgene.c +++ b/drivers/gpio/gpio-xgene.c @@ -173,6 +173,11 @@ static int xgene_gpio_probe(struct platform_device *pdev) } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + err = -EINVAL; + goto err; + } + gpio->base = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res)); if (!gpio->base) { |