diff options
author | imp <imp@FreeBSD.org> | 2003-11-12 05:21:06 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2003-11-12 05:21:06 +0000 |
commit | c5d1f9a45d66a1662aa524c87ef3d2974fae6fa8 (patch) | |
tree | 1147ffbdaac5d6c9645d09c36f8e65f8d37f43cc /sys | |
parent | 88488cca11ed31ba57f4907d49187c869369c6cd (diff) | |
download | FreeBSD-src-c5d1f9a45d66a1662aa524c87ef3d2974fae6fa8.zip FreeBSD-src-c5d1f9a45d66a1662aa524c87ef3d2974fae6fa8.tar.gz |
Fix a harmless typo (use of res instead of rle: if rle is NULL, we'd
still get a panic, just not a nice message) and update to new
__FBSDID.
Submitted by: charnier@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/pccbb/pccbb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index b338101..c213bb4 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -74,6 +72,9 @@ * * David Cross: Author of the initial ugly hack for a specific cardbus card */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> @@ -337,7 +338,7 @@ cbb_insert_res(struct cbb_softc *sc, struct resource *res, int type, * it later. */ rle = malloc(sizeof(struct cbb_reslist), M_DEVBUF, M_NOWAIT); - if (!res) + if (rle == NULL) panic("cbb_cardbus_alloc_resource: can't record entry!"); rle->res = res; rle->type = type; |