Return SR_ERR_MALLOC upon allocation errors.

[libsigrok.git] / hardware / alsa / alsa.c

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index d86ac05fd39f619378b195ee991ad6ea956052eb..c0f4ccaa35f2b24f94fa7a220ec0a2082a7a8592 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -24,8 +24,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <alsa/asoundlib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define NUM_PROBES 2
 #define SAMPLE_WIDTH 16
@@ -76,7 +76,7 @@ static int hw_init(const char *devinfo)
 
        if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
                sr_err("alsa: %s: ctx malloc failed", __func__);
-               return 0;
+               return SR_ERR_MALLOC;
        }
 
        if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "alsa", NULL, NULL))) {
@@ -117,7 +117,7 @@ static int hw_dev_open(int dev_index)
        if (ret < 0) {
                sr_err("alsa: can't allocate hardware parameter structure (%s)",
                       snd_strerror(ret));
-               return SR_ERR;
+               return SR_ERR_MALLOC;
        }
 
        ret = snd_pcm_hw_params_any(ctx->capture_handle, ctx->hw_params);