Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/53177: David Binderman: Better error handling

This commit is contained in:
christos 2018-04-12 21:14:53 +00:00
parent e9bf2ea424
commit 6935db70ac
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/dev/i2c/xc5k.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xc5k.c,v 1.7 2017/06/01 02:45:10 chs Exp $ */
/* $NetBSD: xc5k.c,v 1.8 2018/04/12 21:14:53 christos Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcneill@invisible.ca>
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xc5k.c,v 1.7 2017/06/01 02:45:10 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: xc5k.c,v 1.8 2018/04/12 21:14:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -158,20 +158,27 @@ xc5k_firmware_open(struct xc5k *xc)
aprint_normal_dev(xc->parent, "xc5k: loading firmware '%s/%s'\n",
XC5K_FIRMWARE_DRVNAME, XC5K_FIRMWARE_IMGNAME);
error = xc5k_firmware_upload(xc, fw, fwlen);
if (!error) {
xc5k_read_2(xc, XC5K_REG_VERSION, &xcversion);
xc5k_read_2(xc, XC5K_REG_BUILD, &xcbuild);
if (!error)
aprint_normal_dev(xc->parent,
"xc5k: hw %d.%d, fw %d.%d.%d\n",
(xcversion >> 12) & 0xf,
(xcversion >> 8) & 0xf,
(xcversion >> 4) & 0xf,
xcversion & 0xf,
xcbuild);
if (error)
goto done;
error = xc5k_read_2(xc, XC5K_REG_VERSION, &xcversion);
if (error) {
error = 0;
goto done;
}
error = xc5k_read_2(xc, XC5K_REG_BUILD, &xcbuild);
if (error) {
error = 0;
xcbuild = 0;
}
aprint_normal_dev(xc->parent, "xc5k: hw %d.%d, fw %d.%d.%d\n",
(xcversion >> 12) & 0xf, (xcversion >> 8) & 0xf,
(xcversion >> 4) & 0xf, xcversion & 0xf, xcbuild);
done:
if (fw)
firmware_free(fw, fwlen);