tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'edac_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC fixlets from Borislav Petkov:
"Two minor correctness fixlets from Dan Carpenter and Joe Perches each."

* tag 'edac_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC: Fix kcalloc argument order
EDAC: Test correct variable in ->store function

Linus Torvalds a56e1600 58ff603b

+4 -4
+3 -3
drivers/edac/edac_mc.c
··· 340 340 /* 341 341 * Alocate and fill the csrow/channels structs 342 342 */ 343 - mci->csrows = kcalloc(sizeof(*mci->csrows), tot_csrows, GFP_KERNEL); 343 + mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL); 344 344 if (!mci->csrows) 345 345 goto error; 346 346 for (row = 0; row < tot_csrows; row++) { ··· 351 351 csr->csrow_idx = row; 352 352 csr->mci = mci; 353 353 csr->nr_channels = tot_channels; 354 - csr->channels = kcalloc(sizeof(*csr->channels), tot_channels, 354 + csr->channels = kcalloc(tot_channels, sizeof(*csr->channels), 355 355 GFP_KERNEL); 356 356 if (!csr->channels) 357 357 goto error; ··· 369 369 /* 370 370 * Allocate and fill the dimm structs 371 371 */ 372 - mci->dimms = kcalloc(sizeof(*mci->dimms), tot_dimms, GFP_KERNEL); 372 + mci->dimms = kcalloc(tot_dimms, sizeof(*mci->dimms), GFP_KERNEL); 373 373 if (!mci->dimms) 374 374 goto error; 375 375
+1 -1
drivers/edac/edac_pci_sysfs.c
··· 256 256 struct edac_pci_dev_attribute *edac_pci_dev; 257 257 edac_pci_dev = (struct edac_pci_dev_attribute *)attr; 258 258 259 - if (edac_pci_dev->show) 259 + if (edac_pci_dev->store) 260 260 return edac_pci_dev->store(edac_pci_dev->value, buffer, count); 261 261 return -EIO; 262 262 }