nfp: fix nfp_cpp_read()/nfp_cpp_write() error paths (7d2da603) · Commits · 戴 / test

drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -951,12 +951,14 @@ int nfp_cpp_read(struct nfp_cpp *cpp, u32 destination,
	return -ENOMEM;		return -ENOMEM;

	err = nfp_cpp_area_acquire(area);		err = nfp_cpp_area_acquire(area);
	if (err)		if (err) {
	goto out;		nfp_cpp_area_free(area);
			return err;
			}
	}		}

	err = nfp_cpp_area_read(area, offset, kernel_vaddr, length);		err = nfp_cpp_area_read(area, offset, kernel_vaddr, length);
	out:
	if (cache)		if (cache)
	area_cache_put(cpp, cache);		area_cache_put(cpp, cache);
	else		else
	@@ -993,13 +995,14 @@ int nfp_cpp_write(struct nfp_cpp *cpp, u32 destination,
	return -ENOMEM;		return -ENOMEM;

	err = nfp_cpp_area_acquire(area);		err = nfp_cpp_area_acquire(area);
	if (err)		if (err) {
	goto out;		nfp_cpp_area_free(area);
			return err;
			}
	}		}

	err = nfp_cpp_area_write(area, offset, kernel_vaddr, length);		err = nfp_cpp_area_write(area, offset, kernel_vaddr, length);

	out:
	if (cache)		if (cache)
	area_cache_put(cpp, cache);		area_cache_put(cpp, cache);
	else		else