diff --git a/arch/arm64/configs/vendor/alioth_defconfig b/arch/arm64/configs/vendor/alioth_defconfig index da3ba9c2f868..36cbc02a27c3 100644 --- a/arch/arm64/configs/vendor/alioth_defconfig +++ b/arch/arm64/configs/vendor/alioth_defconfig @@ -20,7 +20,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-InfiniR_Alioth_v2.61" +CONFIG_LOCALVERSION="-InfiniR_Alioth_v2.62" CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y diff --git a/build.sh b/build.sh index b42b6ddd6d12..66f339f210e3 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ KERNEL_DEFCONFIG=vendor/alioth_defconfig ANYKERNEL3_DIR=$PWD/AnyKernel3/ -FINAL_KERNEL_ZIP=InfiniR_Alioth_v2.61.zip +FINAL_KERNEL_ZIP=InfiniR_Alioth_v2.62.zip export ARCH=arm64 # Speed up build process diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 15759388e18c..5a91648b14b6 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c @@ -531,7 +531,7 @@ static inline int dvb_dmx_swfilter_payload(struct dvb_demux_feed *feed, cc = buf[3] & 0x0f; ccok = ((feed->cc + 1) & 0x0f) == cc; if (!ccok) { - set_buf_flags(feed, DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED); + set_buf_flags(feed, DMX_BUF_FLAG_DISCONTINUITY_DETECTED); dprintk_sect_loss("missed packet: %d instead of %d!\n", cc, (feed->cc + 1) & 0x0f); } diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 5802bb2305a3..56d1af6348b1 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -3822,7 +3822,6 @@ static void ffs_func_unbind(struct usb_configuration *c, ffs_event_add(ffs, FUNCTIONFS_UNBIND); if (!--opts->refcnt) functionfs_unbind(ffs); - } /* cleanup after autoconfig */ spin_lock_irqsave(&func->ffs->eps_lock, flags);