Module Name: src
Committed By: riastradh
Date: Thu Jul 17 20:37:01 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: firmware.h
Log Message:
Tweak failure case for Linux firmware API.
request_firmware is guaranteed to yield null on failure;
release_firmware on null is guaranteed to be a no-op.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/firmware.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/firmware.h
diff -u src/sys/external/bsd/drm2/include/linux/firmware.h:1.3 src/sys/external/bsd/drm2/include/linux/firmware.h:1.4
--- src/sys/external/bsd/drm2/include/linux/firmware.h:1.3 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/linux/firmware.h Thu Jul 17 20:37:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: firmware.h,v 1.3 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: firmware.h,v 1.4 2014/07/17 20:37:01 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@ request_firmware(const struct firmware *
fail1: firmware_free(fw->data, fw->size);
fail0: KASSERT(ret);
kmem_free(fw, sizeof(*fw));
+ *fwp = NULL;
return ret;
}
@@ -83,8 +84,10 @@ static inline void
release_firmware(const struct firmware *fw)
{
- firmware_free(fw->data, fw->size);
- kmem_free(__UNCONST(fw), sizeof(*fw));
+ if (fw != NULL) {
+ firmware_free(fw->data, fw->size);
+ kmem_free(__UNCONST(fw), sizeof(*fw));
+ }
}
#endif /* _LINUX_FIRMWARE_H_ */
