From b8f260ce7aa52a5cc8df177f441c9c9e566cfc1f Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Mon, 31 Aug 2009 10:54:37 +0200 Subject: [PATCH] --- yaml --- r: 162565 b: refs/heads/master c: a2279ae5b58edb7cbe2196d08572fcf59f292354 h: refs/heads/master i: 162563: 4e2d849a6c69a77b760920c641a3317a6aa005a6 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h | 3 +++ trunk/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5bca2477c3c5..982b1ed362e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14386fd10c33b6a6a53901a64832f34f038857cf +refs/heads/master: a2279ae5b58edb7cbe2196d08572fcf59f292354 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h index d288289143ea..f96b1289cdfc 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h +++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h @@ -261,6 +261,9 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) pci_vendor = i_ADDIDATADeviceID[i_Count]; if (pcidev->vendor == pci_vendor) { amcc = kmalloc(sizeof(*amcc), GFP_KERNEL); + if (amcc == NULL) + continue; + memset(amcc, 0, sizeof(*amcc)); amcc->pcidev = pcidev; diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h b/trunk/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h index b76f877f250a..49141b3558e1 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h +++ b/trunk/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h @@ -254,6 +254,9 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) pci_for_each_dev(pcidev) { if (pcidev->vendor == pci_vendor) { amcc = kmalloc(sizeof(*amcc), GFP_KERNEL); + if (amcc == NULL) + continue; + memset(amcc, 0, sizeof(*amcc)); amcc->pcidev = pcidev;