Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[platform/kernel/linux-starfive.git] / drivers / slimbus / stream.c

diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c
index 73a2aa3..1d6b386 100644 (file)
--- a/drivers/slimbus/stream.c
+++ b/drivers/slimbus/stream.c
@@ -204,7 +204,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
 {
        struct slim_controller *ctrl = rt->dev->ctrl;
        struct slim_port *port;
-       int num_ports, i, port_id;
+       int num_ports, i, port_id, prrate;
 
        if (rt->ports) {
                dev_err(&rt->dev->dev, "Stream already Prepared\n");
@@ -221,6 +221,13 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
        rt->bps = cfg->bps;
        rt->direction = cfg->direction;
 
+       prrate = slim_get_prate_code(cfg->rate);
+       if (prrate < 0) {
+               dev_err(&rt->dev->dev, "Cannot get presence rate for rate %d Hz\n",
+                       cfg->rate);
+               return prrate;
+       }
+
        if (cfg->rate % ctrl->a_framer->superfreq) {
                /*
                 * data rate not exactly multiple of super frame,
@@ -241,7 +248,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
                port = &rt->ports[i];
                port->state = SLIM_PORT_DISCONNECTED;
                port->id = port_id;
-               port->ch.prrate = slim_get_prate_code(cfg->rate);
+               port->ch.prrate = prrate;
                port->ch.id = cfg->chs[i];
                port->ch.data_fmt = SLIM_CH_DATA_FMT_NOT_DEFINED;
                port->ch.aux_fmt = SLIM_CH_AUX_FMT_NOT_APPLICABLE;
@@ -407,6 +414,9 @@ int slim_stream_disable(struct slim_stream_runtime *stream)
        struct slim_controller *ctrl = stream->dev->ctrl;
        int ret, i;
 
+       if (!stream->ports || !stream->num_ports)
+               return -EINVAL;
+
        if (ctrl->disable_stream)
                ctrl->disable_stream(stream);
 
@@ -438,6 +448,9 @@ int slim_stream_unprepare(struct slim_stream_runtime *stream)
 {
        int i;
 
+       if (!stream->ports || !stream->num_ports)
+               return -EINVAL;
+
        for (i = 0; i < stream->num_ports; i++)
                slim_disconnect_port(stream, &stream->ports[i]);