summaryrefslogtreecommitdiff
path: root/backend/v4l.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/v4l.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/v4l.c')
-rw-r--r--backend/v4l.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/backend/v4l.c b/backend/v4l.c
index f9245d0..b15e5d1 100644
--- a/backend/v4l.c
+++ b/backend/v4l.c
@@ -15,9 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -731,7 +729,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
action == SANE_ACTION_GET_VALUE ? "get" :
action == SANE_ACTION_SET_VALUE ? "set" :
action == SANE_ACTION_SET_AUTO ? "auto set" :
- "(unknow action with)", option,
+ "(unknown action with)", option,
s->opt[option].name ? s->opt[option].name : s->opt[option].title);
cap = s->opt[option].cap;