aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-10-12 18:18:23 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-10-12 18:18:23 +0200
commit0619d9e8f101320ee0ee95e8071031c9217d50a3 (patch)
tree10cef74b78268ede08d6d1d28ef3f5326038d733 /drivers/video
parentMerge tag 'v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next (diff)
downloadlinux-dev-0619d9e8f101320ee0ee95e8071031c9217d50a3.tar.xz
linux-dev-0619d9e8f101320ee0ee95e8071031c9217d50a3.zip
video: fbdev: matroxfb: return -ENOMEM on allocation failure
Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/matrox/matroxfb_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index b9b284d79631..838869c6490c 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -2056,7 +2056,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
minfo = kzalloc(sizeof(*minfo), GFP_KERNEL);
if (!minfo)
- return -1;
+ return -ENOMEM;
minfo->pcidev = pdev;
minfo->dead = 0;