diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
| commit | ca65be80fd770188b15b4aecdd245ddbeb7f46ed (patch) | |
| tree | b76068543cf8760cf057750c9cd4fdd7ab5834d4 /sys/dev/flash | |
| parent | 4104449570e3e74d77537f3a798fbdd632ad311c (diff) | |
| parent | fb64e73880228db0132e7001564d85d5e33a40ea (diff) | |
| download | src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.tar.gz src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.zip | |
Merge ^/head r279313 through r279595.
Notes
Notes:
svn path=/projects/clang360-import/; revision=279596
Diffstat (limited to 'sys/dev/flash')
| -rw-r--r-- | sys/dev/flash/at45d.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 7506434afe0a..347ed9051d6d 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -197,8 +197,10 @@ at45d_attach(device_t dev) /* We'll see what kind of flash we have later... */ sc->config_intrhook.ich_func = at45d_delayed_attach; sc->config_intrhook.ich_arg = sc; - if (config_intrhook_establish(&sc->config_intrhook) != 0) + if (config_intrhook_establish(&sc->config_intrhook) != 0) { device_printf(dev, "config_intrhook_establish failed\n"); + return (ENOMEM); + } return (0); } |