diff --git a/qa/coccinelle/run_check.sh b/qa/coccinelle/run_check.sh
index 7cf2030eb6..d80325167d 100755
--- a/qa/coccinelle/run_check.sh
+++ b/qa/coccinelle/run_check.sh
@@ -1,7 +1,19 @@
 #!/bin/sh
 
 if [ $1 ]; then
-	LIST=$1;
+	case $1 in
+	*[ch])
+		LIST=$@;
+		;;
+        *..*) 
+        	LIST=$(git diff --pretty="format:" --name-only $1 | grep -E '[ch]$')
+		PREFIX="../../"
+		;;
+	*)
+		LIST=$(git show --pretty="format:" --name-only $1 | grep -E '[ch]$')
+		PREFIX="../../"
+		;;
+	esac
 else
 	LIST=$(git ls-tree -r --name-only --full-tree  HEAD src/ | grep -E '*.c$')
 	PREFIX="../../"
@@ -10,7 +22,7 @@ fi
 for SMPL in *.cocci; do
 	echo "Testing cocci file: $SMPL"
 	for FILE in $LIST ; do
-		spatch -sp_file $SMPL  $PREFIX$FILE 2>/dev/null || exit 1;
+		spatch --very-quiet -sp_file $SMPL $PREFIX$FILE || exit 1;
 	done
 done