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 'staging-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
"Here are some small staging driver fixes for 4.15-rc4.

One patch for the ccree driver to prevent an unitialized value from
being returned to a caller, and the other fixes a logic error in the
pi433 driver"

* tag 'staging-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: pi433: Fixes issue with bit shift in rf69_get_modulation
staging: ccree: Uninitialized return in ssi_ahash_import()

Linus Torvalds a84ec723 d6e47eed

+2 -2
+1 -1
drivers/staging/ccree/ssi_hash.c
··· 1769 1769 struct device *dev = drvdata_to_dev(ctx->drvdata); 1770 1770 struct ahash_req_ctx *state = ahash_request_ctx(req); 1771 1771 u32 tmp; 1772 - int rc; 1772 + int rc = 0; 1773 1773 1774 1774 memcpy(&tmp, in, sizeof(u32)); 1775 1775 if (tmp != CC_EXPORT_MAGIC) {
+1 -1
drivers/staging/pi433/rf69.c
··· 102 102 103 103 currentValue = READ_REG(REG_DATAMODUL); 104 104 105 - switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE >> 3) { // TODO improvement: change 3 to define 105 + switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE) { 106 106 case DATAMODUL_MODULATION_TYPE_OOK: return OOK; 107 107 case DATAMODUL_MODULATION_TYPE_FSK: return FSK; 108 108 default: return undefined;