From b95be429befa40264eb29a63310cc0ab0bca1090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= <fschaefer.oss@googlemail.com>
Date: Wed, 26 Dec 2012 19:12:37 +0100
Subject: [PATCH] em28xx: rename module parameter prefer_bulk to usb_xfer_mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since we have now 3 modes (auto/isoc/bulk), usb_xfer_mode is more suitable than prefer_bulk.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-cards.c | 11 ++++++-----
1 Datei geändert, 6 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
@@ -61,9 +61,10 @@ static unsigned int card[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
module_param_array(card, int, NULL, 0444);
MODULE_PARM_DESC(card, "card type");
-static int prefer_bulk = -1;
-module_param(prefer_bulk, int, 0444);
-MODULE_PARM_DESC(prefer_bulk, "prefer USB bulk transfers (-1 = auto, 0 = isoc, 1 = bulk)");
+static int usb_xfer_mode = -1;
+module_param(usb_xfer_mode, int, 0444);
+MODULE_PARM_DESC(usb_xfer_mode,
+ "USB transfer mode for frame data (-1 = auto, 0 = prefer isoc, 1 = prefer bulk)");
/* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS - 1 */
@@ -3399,13 +3400,13 @@ static int em28xx_usb_probe(struct usb_interface *interface,
goto unlock_and_free;
}
- if (prefer_bulk < 0) {
+ if (usb_xfer_mode < 0) {
if (dev->board.is_webcam)
try_bulk = 1;
else
try_bulk = 0;
} else {
- try_bulk = prefer_bulk > 0;
+ try_bulk = usb_xfer_mode > 0;
}
/* Select USB transfer types to use */
--
1.7.10.4