stm/intel_th: Misc fixes
Alexander Shishkin
maintainercover stm/intel_th: Misc fixes
Hi Greg,
Here are two small fixes for issues that robots found in my latest patches in linux-next.
Alexander Shishkin (1):
stm class: Select configfs
Dan Carpenter (1):
intel_th: Check for NULL instead of ERR_PTR
drivers/hwtracing/intel_th/gth.c | 4 ++-- drivers/hwtracing/intel_th/msu.c | 4 ++-- drivers/hwtracing/intel_th/pti.c | 4 ++-- drivers/hwtracing/intel_th/sth.c | 8 ++++---- drivers/hwtracing/stm/Kconfig | 1 + 5 files changed, 11 insertions(+), 10 deletions(-)
Signature · 1 line
2.6.1
Alexander Shishkin
maintainerPATCH 1/2 stm class: Select configfs
STM policy handling is basically configfs, I honestly don't know how we ended up without a Kconfig dependency, but thanks to randconfig testing, it's now caught.
Reported-by Jim Davis <[email protected]>
Reported-by kbuild test robot <[email protected]>
Signed-off-by Alexander Shishkin <[email protected]>
--- drivers/hwtracing/stm/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/hwtracing/stm/Kconfig +1 -0
@@ -1,5 +1,6 @@ config STM tristate "System Trace Module devices" + select CONFIGFS_FS help A System Trace Module (STM) is a device exporting data in System Trace Protocol (STP) format as defined by MIPI STP standards.
Signature · 1 line
2.6.1
Alexander Shishkin
maintainerPATCH 2/2 intel_th: Check for NULL instead of ERR_PTR
In reply to Alexander ShishkinFrom: Dan Carpenter <[email protected]>
devm_ioremap() returns NULL on error, it doesn't return an ERR_PTR, which is what the current code does. This patch corrects these checks.
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Alexander Shishkin <[email protected]>
--- drivers/hwtracing/intel_th/gth.c | 4 ++-- drivers/hwtracing/intel_th/msu.c | 4 ++-- drivers/hwtracing/intel_th/pti.c | 4 ++-- drivers/hwtracing/intel_th/sth.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/hwtracing/intel_th/gth.c +2 -2
@@ -635,8 +635,8 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)return -ENODEV ; base =devm_ioremap (dev, res->start,resource_size (res)); -if (IS_ERR (base)) -return PTR_ERR (base); +if (!base) +return -ENOMEM ; gth =devm_kzalloc (dev,sizeof (*gth),GFP_KERNEL );if (!gth)
drivers/hwtracing/intel_th/msu.c +2 -2
@@ -1458,8 +1458,8 @@ static int intel_th_msc_probe(struct intel_th_device *thdev)return -ENODEV ; base =devm_ioremap (dev, res->start,resource_size (res)); -if (IS_ERR (base)) -return PTR_ERR (base); +if (!base) +return -ENOMEM ; msc =devm_kzalloc (dev,sizeof (*msc),GFP_KERNEL );if (!msc)
drivers/hwtracing/intel_th/pti.c +2 -2
@@ -207,8 +207,8 @@ static int intel_th_pti_probe(struct intel_th_device *thdev)return -ENODEV ; base =devm_ioremap (dev, res->start,resource_size (res)); -if (IS_ERR (base)) -return PTR_ERR (base); +if (!base) +return -ENOMEM ; pti =devm_kzalloc (dev,sizeof (*pti),GFP_KERNEL );if (!pti)
drivers/hwtracing/intel_th/sth.c +4 -4
@@ -194,16 +194,16 @@ static int intel_th_sth_probe(struct intel_th_device *thdev)return -ENODEV ; base =devm_ioremap (dev, res->start,resource_size (res)); -if (IS_ERR (base)) -return PTR_ERR (base); +if (!base) +return -ENOMEM ; res =intel_th_device_get_resource (thdev,IORESOURCE_MEM ,1 );if (!res)return -ENODEV ; channels =devm_ioremap (dev, res->start,resource_size (res)); -if (IS_ERR (channels)) -return PTR_ERR (channels); +if (!channels) +return -ENOMEM ; sth =devm_kzalloc (dev,sizeof (*sth),GFP_KERNEL );if (!sth)
Signature · 1 line
2.6.1