diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ieee1394/sbp2.c | 3 | ||||
-rw-r--r-- | drivers/input/mouse/alps.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/kaweth.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 00c7b958361a..ab82d6addd7f 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -745,7 +745,8 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud | |||
745 | list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids); | 745 | list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids); |
746 | 746 | ||
747 | /* Register our host with the SCSI stack. */ | 747 | /* Register our host with the SCSI stack. */ |
748 | scsi_host = scsi_host_alloc(&scsi_driver_template, 0); | 748 | scsi_host = scsi_host_alloc(&scsi_driver_template, |
749 | sizeof (unsigned long)); | ||
749 | if (!scsi_host) { | 750 | if (!scsi_host) { |
750 | SBP2_ERR("failed to register scsi host"); | 751 | SBP2_ERR("failed to register scsi host"); |
751 | goto failed_alloc; | 752 | goto failed_alloc; |
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 42a9f7f6f8cb..7bf4be733e9a 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
@@ -352,7 +352,7 @@ static int alps_reconnect(struct psmouse *psmouse) | |||
352 | if (alps_get_status(psmouse, param)) | 352 | if (alps_get_status(psmouse, param)) |
353 | return -1; | 353 | return -1; |
354 | 354 | ||
355 | if (param[0] & 0x04) | 355 | if (!(param[0] & 0x04)) |
356 | alps_tap_mode(psmouse, 1); | 356 | alps_tap_mode(psmouse, 1); |
357 | 357 | ||
358 | if (alps_absolute_mode(psmouse)) { | 358 | if (alps_absolute_mode(psmouse)) { |
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c index a9a7cf4a38eb..fd6ff4cb2c62 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/usb/net/kaweth.c | |||
@@ -520,7 +520,7 @@ static void int_callback(struct urb *u, struct pt_regs *regs) | |||
520 | 520 | ||
521 | /* we check the link state to report changes */ | 521 | /* we check the link state to report changes */ |
522 | if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) { | 522 | if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) { |
523 | if (!act_state) | 523 | if (act_state) |
524 | netif_carrier_on(kaweth->net); | 524 | netif_carrier_on(kaweth->net); |
525 | else | 525 | else |
526 | netif_carrier_off(kaweth->net); | 526 | netif_carrier_off(kaweth->net); |