diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 18:36:17 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 18:36:17 -0700 |
| commit | daefd89efc279b142bbb054577c2d706da211723 (patch) | |
| tree | 2298056232548f6f22d7bbff2662a2bbf64520de /drivers/scsi/mac_esp.c | |
| parent | 6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff) | |
| parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff) | |
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'drivers/scsi/mac_esp.c')
| -rw-r--r-- | drivers/scsi/mac_esp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index 4ceeace80453..70eb1f79b1ba 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c @@ -565,8 +565,7 @@ static int __devinit esp_mac_probe(struct platform_device *dev) esp_chips[dev->id] = esp; mb(); if (esp_chips[!dev->id] == NULL) { - err = request_irq(host->irq, mac_scsi_esp_intr, 0, - "Mac ESP", NULL); + err = request_irq(host->irq, mac_scsi_esp_intr, 0, "ESP", NULL); if (err < 0) { esp_chips[dev->id] = NULL; goto fail_free_priv; |