3 files changed, 4 insertions, 6 deletions

diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 9ea6bd0ddc35..2dd1b57b0ba4 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -104,7 +104,6 @@ capifs_fill_super(struct super_block *s, void *data, int silent)
         inode->i_ino = 1;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
         inode->i_blocks = 0;
-        inode->i_blksize = 1024;
         inode->i_uid = inode->i_gid = 0;
         inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
         inode->i_op = &simple_dir_inode_operations;
@@ -149,7 +148,6 @@ void capifs_new_ncci(unsigned int number, dev_t device)
         if (!inode)
                 return;
         inode->i_ino = number+2;
-        inode->i_blksize = 1024;
         inode->i_uid = config.setuid ? config.uid : current->fsuid;
         inode->i_gid = config.setgid ? config.gid : current->fsgid;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 3845defd4901..5cfbe6a38010 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -192,7 +192,7 @@ static char *get_usb_statmsg(int status)
                 return "bit stuffing error, timeout, or unknown USB error";
         case -EILSEQ:
                 return "CRC mismatch, timeout, or unknown USB error";
-        case -ETIMEDOUT:
+        case -ETIME:
                 return "timed out";
         case -EPIPE:
                 return "endpoint stalled";
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index ec52c1a7c22a..6349367ed480 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -137,11 +137,11 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
         {-ENXIO, "URB already queued"},
         {-EFBIG, "Too much ISO frames requested"},
         {-ENOSR, "Buffer error (overrun)"},
-        {-EPIPE, "Specified endpoint is stalled (device not responding)"},
+        {-EPIPE, "Specified endpoint is stalled"},
         {-EOVERFLOW, "Babble (bad cable?)"},
         {-EPROTO, "Bit-stuff error (bad cable?)"},
-        {-EILSEQ, "CRC/Timeout"},
-        {-ETIMEDOUT, "NAK (device does not respond)"},
+        {-EILSEQ, "CRC or missing token"},
+        {-ETIME, "Device did not respond"},
         {-ESHUTDOWN, "Device unplugged"},
         {-1, NULL}
 };