summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io/fd.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-02-26 12:43:20 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-02-26 12:43:20 +0000
commite5af3bd1c99c58d9dd19baec10e1b5e8f064858d (patch)
treee4674045e090ab283ea4b0877c9b58f9ac7bee64 /usr/src/uts/common/io/fd.c
parent1b1bcfc89ac08be2fc9fd5df44b98ec44e4d909b (diff)
parent52abb70e073c2a88808c0d66fd810ba8c5080572 (diff)
downloadillumos-joyent-e5af3bd1c99c58d9dd19baec10e1b5e8f064858d.tar.gz
[illumos-gate merge]
commit 52abb70e073c2a88808c0d66fd810ba8c5080572 9691 fat zap should prefetch when iterating commit 8648b7db4afb6cc9a8e5b55e38e99c8c64b74e86 10435 dld: NULL pointer errors commit c4b91d4b4753f33280a63b16f5116d23427088b1 10444 linenoise: this statement may fall through commit 584814c74382743e01cc62cc8764cfde61718c46 10443 loader: move panic.c to libstand commit c11cea93a9321bd25667986dc65a86b56de2ac04 10441 hxge: NULL pointer errors commit 1f14a912903a53cb5b4ed3f75e9e4d2be8ded1ba 10440 ipd: NULL pointer errors commit 2520aea3664a4259338aefa2aa4a4945654615c6 10439 ecpp: NULL pointer errors commit 55aeed12a7fb74469f7ea0fbb3d2329d4c8c96ae 10438 fd: NULL pointer errors commit 5c63ad82aeee3300425b5803b5324fd102047957 10437 dca: NULL pointer errors commit 8d3c0bf06dddf77026f7ea064cfccfae818b5b0f 10434 dump: NULL pointer errors commit a3f59f6e87a609ee4950ebfcf34be0cca305e58b 10433 bpf: NULL pointer errors commit 093aa5c8de00cc7b99cc4a2cfaeb7d95115847b7 10432 devinfo: NULL pointer errors commit a897f299fb4fe4ed74ba062d6b8984404d1b94bc 10431 conskbd: NULL pointer errors commit b63d0986fbd0638ed6abf1248f1a297c5d9a4f91 10151 mv_xattrs() checks for a NULL array name commit 5085a9e0a8c766d5e9b74954833264533f617614 10369 sysent: cast between incompatible function types commit ebc6491a5a66ba44ff1a3fa2a627e67d665604f0 10163 ufs_fsck: bitwise comparison always evaluates to false
Diffstat (limited to 'usr/src/uts/common/io/fd.c')
-rw-r--r--usr/src/uts/common/io/fd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/fd.c b/usr/src/uts/common/io/fd.c
index d591e04331..5ad6022610 100644
--- a/usr/src/uts/common/io/fd.c
+++ b/usr/src/uts/common/io/fd.c
@@ -493,7 +493,7 @@ fd_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
sig_minor = drive_num << 3;
for (dmdp = fd_minor; dmdp->name != NULL; dmdp++) {
if (ddi_create_minor_node(dip, dmdp->name, dmdp->type,
- sig_minor | dmdp->minor, DDI_NT_FD, NULL)
+ sig_minor | dmdp->minor, DDI_NT_FD, 0)
== DDI_FAILURE) {
ddi_remove_minor_node(dip, NULL);
goto no_attach;
@@ -2174,7 +2174,7 @@ fd_prop_op(dev_t dev, dev_info_t *dip, ddi_prop_op_t prop_op, int mod_flags,
* request is passed to ddi_prop_op.
*/
if (dev == DDI_DEV_T_ANY) {
-pass: return (ddi_prop_op(dev, dip, prop_op, mod_flags,
+pass: return (ddi_prop_op(dev, dip, prop_op, mod_flags,
name, valuep, lengthp));
} else {
/*
@@ -2308,7 +2308,7 @@ fd_check_media(dev_t dev, enum dkio_state state)
/*
* fd_get_media_info :
- * Collects medium information for
+ * Collects medium information for
* DKIOCGMEDIAINFO ioctl.
*/