diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index cc5db0e..6e63730 100644
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -967,7 +967,7 @@
 		break;
 	default:
 		dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
-		break;
+		return -EINVAL;
 	}
 
 	return 0;
@@ -1023,7 +1023,7 @@
 		break;
 	default:
 		dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
-		break;
+		return -EINVAL;
 	}
 
 	return 0;
@@ -1085,7 +1085,7 @@
 		break;
 	default:
 		dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
-		break;
+		return -EINVAL;
 	}
 	return 0;
 }
@@ -1144,6 +1144,7 @@
 		break;
 	default:
 		dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
+		return -EINVAL;
 	}
 
 	return 0;
@@ -1201,7 +1202,7 @@
 		stb0899_write_reg(state, STB0899_DISEQCOCFG, 0x20);
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 	return 0;
 }